geirm 01/06/02 07:33:33
Modified: src/java/org/apache/velocity/context Tag: VEL_1_1_BRANCH
AbstractContext.java
Log:
Change from HEAD to ensure that an event cartridge doesn't get lost when
the context is wrapped.
Revision Changes Path
No revision
No revision
1.4.4.1 +11 -1
jakarta-velocity/src/java/org/apache/velocity/context/AbstractContext.java
Index: AbstractContext.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/AbstractContext.java,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- AbstractContext.java 2001/03/28 03:01:04 1.4
+++ AbstractContext.java 2001/06/02 14:33:31 1.4.4.1
@@ -85,7 +85,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: AbstractContext.java,v 1.4 2001/03/28 03:01:04 geirm Exp $
+ * @version $Id: AbstractContext.java,v 1.4.4.1 2001/06/02 14:33:31 geirm Exp $
*/
public abstract class AbstractContext extends InternalContextBase
@@ -171,6 +171,16 @@
public AbstractContext( Context inner )
{
innerContext = inner;
+
+ /*
+ * now, do a 'forward pull' of event cartridge so
+ * it's accessable, bringing to the top level.
+ */
+
+ if (innerContext instanceof InternalEventContext )
+ {
+ attachEventCartridge( ( (InternalEventContext)
innerContext).getEventCartridge() );
+ }
}
/**
