svn commit: [jahia] r19132 - /trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java

[tdraier]

Author: tdraier
Date: Tue Nov 13 12:01:49 2007
New Revision: 19132

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19132&repname=
=3Djahia
Log:
allow container import to create a site without npe( JAHIA-2524 )

Modified:
    trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java

Modified: trunk/core/src/java/org/jahia/services/importexport/ImportHandler=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportHandler.java&rev=3D19132&repname=3Djah=
ia
=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/importexport/ImportHandler.java =
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java =
Tue Nov 13 12:01:49 2007
@@ -393,6 +393,9 @@
                 } else {
                     if (currentObject =3D=3D null && site.getHomePageID() =
=3D=3D -1) {
                         JahiaPage jahiaPage =3D createPage(localName, name=
spaceURI, qName, atts, 0, site.getAclID(),null);
+                        if (jahiaPage =3D=3D null) {
+                            return;
+                        }
                         currentObject =3D jahiaPage.getContentPage();
 =

                         WorkflowEvent theEvent =3D new WorkflowEvent (this=
, currentObject, jParams.getUser(), language, false);

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