svn commit: [jahia] r18694 - /branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java

[tdraier]

Author: tdraier
Date: Thu Sep 27 15:38:18 2007
New Revision: 18694

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18694&repname=
=3Djahia
Log:
ignore containers with no definitions (JAHIA-2414)

Modified:
    branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/Impo=
rtExportBaseService.java

Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexpor=
t/ImportExportBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java&=
rev=3D18694&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-4-1-BRANCH/src/java/org/jahia/services/importexport/Impo=
rtExportBaseService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/Impo=
rtExportBaseService.java Thu Sep 27 15:38:18 2007
@@ -684,6 +684,11 @@
                 ContentContainerList cc =3D (ContentContainerList) object;
                 ContainerDefinitionKey cdk =3D (ContainerDefinitionKey) cc=
.getDefinitionKey(toLoadRequest);
                 JahiaContainerDefinition jcd =3D (JahiaContainerDefinition=
) JahiaContainerDefinition.getInstance(cdk);
+
+                if (jcd =3D=3D null ) {
+                    return;
+                }
+
                 currentPage =3D cc.getPage();
                 elementName =3D jcd.getName() + "List";
 =


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