svn commit: r438145 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components: Else.java ElseIf.java If.java

[tmjee]

Author: tmjee
Date: Tue Aug 29 11:29:01 2006
New Revision: 438145

URL: http://svn.apache.org/viewvc?rev=438145&view=rev
Log:
WW-1422
 - Else tag body displayed when it shouldn't

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

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java?rev=438145&r1=438144&r2=438145&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Else.java 
Tue Aug 29 11:29:01 2006
@@ -61,10 +61,11 @@
     public boolean start(Writer writer) {
         Map context = stack.getContext();
         Boolean ifResult = (Boolean) context.get(If.ANSWER);
+        ifResult = ifResult == null ? Boolean.FALSE : ifResult;
 
         context.remove(If.ANSWER);
 
-        return !((ifResult == null) || (ifResult.booleanValue()));
-
+        //return !((ifResult == null) || (ifResult.booleanValue()));
+        return ! ifResult.booleanValue();
     }
 }

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=438145&r1=438144&r2=438145&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
 Tue Aug 29 11:29:01 2006
@@ -67,8 +67,10 @@
 
     public boolean start(Writer writer) {
         Boolean ifResult = (Boolean) stack.getContext().get(If.ANSWER);
-
-        if ((ifResult == null) || (ifResult.booleanValue())) {
+        ifResult = ifResult == null ? Boolean.FALSE : ifResult;
+        
+        //if ((ifResult == null) || (ifResult.booleanValue())) {
+        if (ifResult.booleanValue()) {
             return false;
         }
 

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java?rev=438145&r1=438144&r2=438145&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java 
(original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/If.java 
Tue Aug 29 11:29:01 2006
@@ -85,12 +85,11 @@
             answer = Boolean.FALSE;
         }
         
-        stack.getContext().put(ANSWER, answer);
         return answer.booleanValue();
     }
 
     public boolean end(Writer writer, String body) {
-
+       stack.getContext().put(ANSWER, answer);
         return super.end(writer, body);
     }
 }