You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/07/19 10:16:22 UTC
svn commit: r557520 - in
/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event:
EndElement.java EndPrefixMapping.java
Author: gkossakowski
Date: Thu Jul 19 01:16:21 2007
New Revision: 557520
URL: http://svn.apache.org/viewvc?view=rev&rev=557520
Log:
COCOON-2094: Fix local contexts handling.
Modified:
cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java
cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndPrefixMapping.java
Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java?view=diff&rev=557520&r1=557519&r2=557520
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndElement.java Thu Jul 19 01:16:21 2007
@@ -48,7 +48,6 @@
// Send any pending endPrefixMapping events
namespaces.leaveScope(consumer);
- objectModel.cleanupLocalContext();
return getNext();
}
Modified: cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndPrefixMapping.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndPrefixMapping.java?view=diff&rev=557520&r1=557519&r2=557520
==============================================================================
--- cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndPrefixMapping.java (original)
+++ cocoon/whiteboard/objectmodel/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/script/event/EndPrefixMapping.java Thu Jul 19 01:16:21 2007
@@ -44,7 +44,10 @@
ExecutionContext executionContext, MacroContext macroContext,
NamespacesTable namespaces, Event startEvent, Event endEvent) throws SAXException {
- // nothing (endPrefixMapping is sent in EndElement)
+ // (endPrefixMapping is sent in EndElement)
+
+ objectModel.cleanupLocalContext();
+
return getNext();
}
}