X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jackrabbit%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjackrabbit%2FJackrabbitWrapper.java;h=86fc95b62522277f461fdbc7a4a66aa6162c03ef;hb=4d3803976f19a5d09e39f4eff05db8c226762395;hp=7ed7737f8ca8806fa0296eef64f7c8d49206419a;hpb=06f918c09528d763a7c1664da5a3c28fcc77b580;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java
index 7ed7737f8..86fc95b62 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java
@@ -191,7 +191,12 @@ public class JackrabbitWrapper extends JcrRepositoryWrapper implements
 
 			reader = new InputStreamReader(new ByteArrayInputStream(cndContent));
 			// actually imports the CND
-			CndImporter.registerNodeTypes(reader, session, true);
+			try {
+				CndImporter.registerNodeTypes(reader, session, true);
+			} catch (Exception e) {
+				log.error("Cannot import data model " + resUrl, e);
+				return;
+			}
 
 			if (dataModel != null && !dataModel.isNodeType(NodeType.NT_FILE)) {
 				dataModel.remove();