From a0801ac0a1d86491fa9dcd3f4e0a8b0c14e01837 Mon Sep 17 00:00:00 2001
From: Toby Jee <tmjee@apache.org>
Date: Wed, 30 Aug 2006 07:39:00 +0000
Subject: [PATCH] WW-1422   - fixed else tag executed when it is not suppose,
 when used with ElseIf tag.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@438410 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/struts2/components/ElseIf.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/struts2/components/ElseIf.java b/core/src/main/java/org/apache/struts2/components/ElseIf.java
index 2ad93f0ba..c43d896f2 100644
--- a/core/src/main/java/org/apache/struts2/components/ElseIf.java
+++ b/core/src/main/java/org/apache/struts2/components/ElseIf.java
@@ -85,7 +85,12 @@ public class ElseIf extends Component {
     }
 
     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, "");
     }