Author: tdraier
Date: Wed Sep 26 18:06:39 2007
New Revision: 18677
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18677&repname=
=3Djahia
Log:
avoid npe in WorkflowEventListener (JAHIA-2384)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowEventListener.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowEventListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowEventListener.jav=
a&rev=3D18677&repname=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-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowEventListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowEventListener.java Wed Sep 26 18:06:39 2007
@@ -86,7 +86,10 @@
ContentObject contentObject =3D (ContentObject) we.getObject();
ContentObjectKey key =3D (ContentObjectKey) contentObject.getO=
bjectKey();
try {
- allTops.put(service.getTopLinkedObject(key), new Integer(c=
ontentObject.getSiteID()));
+ ContentObjectKey k =3D service.getTopLinkedObject(key);
+ if (k !=3D null) {
+ allTops.put(k, new Integer(contentObject.getSiteID()));
+ }
} catch (JahiaException e) {
logger.error("Cannot get main object", e);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
