svn commit: [jahia] r17738 - /trunk/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java

[tdraier]

Author: tdraier
Date: Mon Jun 25 14:28:33 2007
New Revision: 17738

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17738&repname=
=3Djahia
Log:
avoid npe ( backport 17284 )

Modified:
    trunk/core/src/java/org/jahia/services/containers/JahiaContainersBaseSe=
rvice.java

Modified: trunk/core/src/java/org/jahia/services/containers/JahiaContainers=
BaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/containers/JahiaContainersBaseService.java&rev=3D17738&re=
pname=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
--- trunk/core/src/java/org/jahia/services/containers/JahiaContainersBaseSe=
rvice.java (original)
+++ trunk/core/src/java/org/jahia/services/containers/JahiaContainersBaseSe=
rvice.java Mon Jun 25 14:28:33 2007
@@ -2443,10 +2443,12 @@
                                                     StateModificationConte=
xt stateModifContext)
             throws JahiaException {
         ContentContainer contentContainer =3D ContentContainer.getContaine=
r(id);
-        int siteId =3D 0;
-        if ( contentContainer !=3D null ){
-            siteId =3D contentContainer.getSiteID();
+
+        if ( contentContainer =3D=3D null ) {
+            return false;
         }
+
+        int siteId =3D contentContainer.getSiteID();
         /**
          * NK:
          * Testing if the container will be completely deleted has no mean=
ing,

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list