svn commit: r438410 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java

[tmjee]

Author: tmjee
Date: Wed Aug 30 00:39:00 2006
New Revision: 438410

URL: http://svn.apache.org/viewvc?rev=438410&view=rev
Log:
WW-1422
  - fixed else tag executed when it is not suppose, when used with ElseIf tag.

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java?rev=438410&r1=438409&r2=438410&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/ElseIf.java
 Wed Aug 30 00:39:00 2006
@@ -85,7 +85,12 @@
     }
 
     public boolean end(Writer writer, String body) {
-
+        if (answer == null) {
+            answer = Boolean.FALSE;
+        }
+        if (answer.booleanValue()) {
+            stack.getContext().put(If.ANSWER, answer);
+        }
         return super.end(writer, "");
     }