Author: bpapez
Date: Tue May 15 12:25:50 2007
New Revision: 17303

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17303&repname=
=3Djahia
Log:
fix for bug found during IOM audit - 3 new events were not dispatched to JS=
P eventlistener

Modified:
    branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/events/JSPEventLi=
stener.java

Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/events/JSPE=
ventListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/events/JSPEventListener.java&rev=3D17303&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/events/JSPEventLi=
stener.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/events/JSPEventLi=
stener.java Tue May 15 12:25:50 2007
@@ -1,12 +1,12 @@
 package org.jahia.services.events;
 =

+import org.jahia.content.events.ContentActivationEvent;
 import org.jahia.data.events.JahiaEvent;
 import org.jahia.data.events.JahiaEventListener;
 import org.jahia.params.ParamBean;
 import org.jahia.registries.ServicesRegistry;
 =

 import java.io.File;
-import org.jahia.content.events.ContentActivationEvent;
 =

 /**
  * <p>Title: A Jahia Event Listener that dispatches to JSP files</p>
@@ -76,7 +76,7 @@
 =

             logger.debug ("Dispatching to JSP " + jspFileName +
                     " for processing of event " + eventName);
-            if (paramBean.getRequest() !=3D null) {
+            if (paramBean !=3D null && paramBean.getRequest()!=3Dnull) {
                 paramBean.getRequest ().setAttribute ("eventName", eventNa=
me);
                 paramBean.getRequest ().setAttribute ("jahiaEvent", je);
                 ServicesRegistry.getInstance ().getJahiaFetcherService ()
@@ -187,6 +187,18 @@
         dispatchToJSP ("userLoggedOut", je);
     }
 =

+    public void beforeContainerActivation (JahiaEvent je) {
+        dispatchToJSP ("beforeContainerActivation", je);
+    }
+
+    public void updateContainerEngineBeforeSave (JahiaEvent je) {
+        dispatchToJSP ("updateContainerEngineBeforeSave", je);
+    }
+
+    public void updateContainerEngineAfterInit (JahiaEvent je) {
+        dispatchToJSP ("updateContainerEngineAfterInit", je);
+    }
+
     public void contentActivation (ContentActivationEvent theEvent) {
         dispatchToJSP ("contentActivation", theEvent);
     }

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to