svn commit: [jahia] r18576 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/containers/ContentContainerList.java

[tdraier]

Author: tdraier
Date: Thu Sep 20 15:43:37 2007
New Revision: 18576

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18576&repname=
=3Djahia
Log:
avoid npe when deleting staged-only container and subcontainerlist ( JAHIA-=
2187 )

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/ContentContainerList.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/ContentContainerList.ja=
va&rev=3D18576&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/container=
s/ContentContainerList.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java Thu Sep 20 15:43:37 2007
@@ -127,7 +127,10 @@
         int siteId =3D -1;
         try {
             try {
-                siteId =3D getParent(null, null, null).getSiteID();
+                ContentObject contentObject =3D getParent(null, null, null=
);
+                if (contentObject !=3D null) {
+                    siteId =3D contentObject.getSiteID();
+                }
             } catch (JahiaPageNotFoundException pnfe) {
                 // parent page can already be deleted --> try via definiti=
on
             }

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