Return-Path: <_www@dev.magnolia.info> Received: from dev.magnolia.info ([213.173.174.20] verified) by mail.obinary.com (CommuniGate Pro SMTP 5.1.10) with ESMTP id 14522082 for svn-list@magnolia.info; Wed, 16 Jul 2008 09:59:21 +0200 Received: by dev.magnolia.info (Postfix, from userid 70) id 671B96878EA; Wed, 16 Jul 2008 09:59:21 +0200 (CEST) MIME-Version: 1.0 X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/ From: svn@magnolia.info Errors-To: svn@magnolia.info To: svn-list@magnolia.info Subject: [16843] don't crash on updates if not able to find the custom_nodetypes. xml files Reply-To: dev-list@magnolia.info Content-Type: text/html; charset=UTF-8 Message-Id: <20080716075921.671B96878EA@dev.magnolia.info> Date: Wed, 16 Jul 2008 09:59:21 +0200 (CEST) Content-Transfer-Encoding: quoted-printable [16843] don't crash on updates if not able to find the custom_node= types.xml files
Revision
16843
Author
fgiust
Date
2008-07-16 09:59:20 +0200 (Wed, 16 Jul 2008)

Log Message

don't crash on updates if not able to find the custom_nodetypes.xml =
files

Modified Paths

Diff

Modified: magnolia/trunk/magnolia-core/src/mai= n/java/info/magnolia/setup/for3_6/CheckNodeTypesDefinition.java (16842 =3D= > 16843)


--- magnolia/trunk/magnolia-core/src/main/java/info/=
magnolia/setup/for3_6/CheckNodeTypesDefinition.java	2008-07-15 19:10:35 U=
TC (rev 16842)
+++ magnolia/trunk/magnolia-core/src/main/java/info/magnolia/setup/for3_6=
/CheckNodeTypesDefinition.java	2008-07-16 07:59:20 UTC (rev 16843)
@@ -73,6 +73,12 @@
=20
         File nodeTypeFile =3D new File(repoHom=
e, "magnolia/repository/nodetypes/custom_nodetypes.xml");
=20
+        if (!nodeTypeFile.exists()) {
+            // don't crash if the repository.xml has been customized and=
 doesn't use the magnolia.repositories.home
+            // property for the base path
+            return true;
+        }
+
         SAXBuilder builder =3D new SAXBuilder()=
;
         Document doc;
         try {