Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2009-04-27 10:51:13 -0400
committerpelder2009-04-27 10:51:13 -0400
commit0b9fc586f424606188325a4a845036cde1a0ead8 (patch)
tree170f55fd7435a446e1ec3ce9bb513e0634e06c97
parent6a24e094718bf0054043217b0af95e86fac4f5bf (diff)
downloadorg.eclipse.jet-0b9fc586f424606188325a4a845036cde1a0ead8.tar.gz
org.eclipse.jet-0b9fc586f424606188325a4a845036cde1a0ead8.tar.xz
org.eclipse.jet-0b9fc586f424606188325a4a845036cde1a0ead8.zip
[273762] EmptyStackException on <c:iterate> tag with numeric select
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/IterateTag.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/IterateTag.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/IterateTag.java
index 9ac9e47..d7fad44 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/IterateTag.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/taglib/control/IterateTag.java
@@ -118,7 +118,7 @@ public class IterateTag extends AbstractIteratingTag
public void doAfterBody(TagInfo td, JET2Context context, JET2Writer out) throws JET2TagException
{
// restore variables, context objects from previous interation up variables
- if (updateContext(context))
+ if (updateContext(context) && nodeSetIteration)
{
XPathContextExtender.getInstance(context).popXPathContextObject();
}
@@ -136,10 +136,6 @@ public class IterateTag extends AbstractIteratingTag
XPathContextExtender xpathContext = XPathContextExtender.getInstance(context);
- if(updateContext(context)) {
- context.getSource();
- }
-
if (varName != null && context.hasVariable(varName))
{
savedVarValue = context.getVariable(varName);

Back to the top