geirm 01/05/22 04:39:25
Modified: src/java/org/apache/velocity/context AbstractContext.java
Log:
Test solution to the 'bury the EventCartridge' problem that arises when you
chain contexts. Will float past the list to see if acceptable, and then
commit in 1.1 branch as well
Revision Changes Path
1.5 +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.5
diff -u -r1.4 -r1.5
--- AbstractContext.java 2001/03/28 03:01:04 1.4
+++ AbstractContext.java 2001/05/22 11:39:21 1.5
@@ -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.5 2001/05/22 11:39:21 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() );
+ }
}
/**
