r1104 - xwiki/trunk/src/main/java/com/xpn/xwiki/notify

Ludovic Dubost ludovic at users.forge.objectweb.org
Mon Jul 31 11:29:30 CEST 2006


Author: ludovic
Date: 2006-07-31 11:29:30 +0200 (Mon, 31 Jul 2006)
New Revision: 1104

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java
Log:
Fixed null pointer in hasEqualsObjectsFromClass

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java	2006-07-31 09:27:12 UTC (rev 1103)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java	2006-07-31 09:29:30 UTC (rev 1104)
@@ -45,8 +45,8 @@
     }
 
     public boolean hasEqualsObjectsFromClass(XWikiDocument newdoc, XWikiDocument olddoc, String classname) {
-        Vector vobj1 = newdoc.getObjects(classname);
-        Vector vobj2 = olddoc.getObjects(classname);
+        Vector vobj1 = (newdoc==null) ? null : newdoc.getObjects(classname);
+        Vector vobj2 = (olddoc==null) ? null : olddoc.getObjects(classname);
         if ((vobj1==null)&&(vobj2==null))
             return true;
         if ((vobj1==null)||(vobj2==null))





More information about the Xwiki-notifications mailing list