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

[sshyrkov]

Author: sshyrkov
Date: Fri Aug 31 17:54:03 2007
New Revision: 18333

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18333&repname=
=3Djahia
Log:
JAHIA-2143: Exception raised each time I delete a page =

http://www.jahia.net/jira/browse/JAHIA-2143
Cause: NPE was caused by a missing parent page for the container list
Resolution: retrieve site ID using container definition if the parent page =
was already deleted

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=3D18333&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 Fri Aug 31 17:54:03 2007
@@ -25,9 +25,11 @@
 import org.jahia.data.containers.JahiaContainerList;
 import org.jahia.data.fields.LoadFlags;
 import org.jahia.exceptions.JahiaException;
+import org.jahia.exceptions.JahiaPageNotFoundException;
 import org.jahia.hibernate.manager.JahiaContainerListManager;
 import org.jahia.hibernate.manager.SpringContextSingleton;
 import org.jahia.params.ProcessingContext;
+import org.jahia.registries.JahiaContainerDefinitionsRegistry;
 import org.jahia.registries.ServicesRegistry;
 import org.jahia.services.pages.ContentPage;
 import org.jahia.services.usermanager.JahiaAdminUser;
@@ -122,14 +124,29 @@
 =

 =

     public int getSiteID() {
+        int siteId =3D -1;
         try {
-            return getParent(null,null,null).getSiteID();
+            try {
+                siteId =3D getParent(null, null, null).getSiteID();
+            } catch (JahiaPageNotFoundException pnfe) {
+                // parent page can already be deleted --> try via definiti=
on
+            }
+            if (siteId =3D=3D -1) {
+                // try via definition
+                JahiaContainerDefinition ctnDef =3D JahiaContainerDefiniti=
onsRegistry
+                        .getInstance().getDefinition(
+                                getContainerListDefinitionID());
+                if (ctnDef !=3D null) {
+                    siteId =3D ctnDef.getJahiaID();
+                }
+
+            }
         } catch (JahiaException e) {
             logger.error(
                     "Unable to obtain site ID for the content container li=
st object with ID "
                             + getID(), e);
         }
-        return -1;
+        return siteId;
     }
 =

     //--------------------------------------------------------------------=
-----

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