You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2001/07/03 18:20:41 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets VelocityPortletAction.java
raphael 01/07/03 09:20:40
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
VelocityPortletAction.java
Log:
[fix] make sure VelocityPortlet Action processes ActionEvents even when
implicitely invoked
Revision Changes Path
1.4 +6 -20 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/VelocityPortletAction.java
Index: VelocityPortletAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/VelocityPortletAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocityPortletAction.java 2001/07/02 07:33:42 1.3
+++ VelocityPortletAction.java 2001/07/03 16:20:36 1.4
@@ -91,28 +91,14 @@
protected void perform( RunData rundata )
throws Exception
{
- // first try to see if there are some events registered for this
- // action...
- Context context = getContext(rundata);
- if (context != null)
+ try
{
- // if context is already defined, events have already been
- // processed, call doPerform
- doPerform(rundata);
- }
- else
+ executeEvents(rundata, getContext(rundata) );
+ }
+ catch (NoSuchMethodException e)
{
- context = TurbineVelocity.getContext();
- rundata.getTemplateInfo().setTemplateContext("VelocityActionContext",context);
- try
- {
- executeEvents(rundata, context );
- }
- catch (NoSuchMethodException e)
- {
- // no event selected
- doPerform(rundata, context);
- }
+ // no event selected
+ doPerform(rundata, getContext(rundata));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org