jmcnally 01/05/29 17:57:18
Modified: src/java/org/apache/turbine/util/velocity
VelocityActionEvent.java
Log:
some actions (Login) occur before anything may have placed the Context into
RunData. Change to the standard way of either grabbing the existing context
or creating a new one, if one does not already exist.
Revision Changes Path
1.8 +3 -4
jakarta-turbine/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
Index: VelocityActionEvent.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VelocityActionEvent.java 2001/05/06 17:06:48 1.7
+++ VelocityActionEvent.java 2001/05/30 00:57:18 1.8
@@ -60,7 +60,7 @@
import org.apache.turbine.modules.ActionEvent;
-import org.apache.turbine.services.velocity.VelocityService;
+import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.RunData;
@@ -84,7 +84,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: VelocityActionEvent.java,v 1.7 2001/05/06 17:06:48 jvanzyl Exp $
+ * @version $Id: VelocityActionEvent.java,v 1.8 2001/05/30 00:57:18 jmcnally Exp $
*/
public abstract class VelocityActionEvent extends ActionEvent
{
@@ -111,8 +111,7 @@
{
try
{
- executeEvents(data, (Context)data.getTemplateInfo()
- .getTemplateContext(VelocityService.CONTEXT));
+ executeEvents(data, TurbineVelocity.getContext(data));
}
catch (NoSuchMethodException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
