Make CND import more robust

git-svn-id: https://svn.argeo.org/commons/trunk@5973 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 7ed7737f8ca8806fa0296eef64f7c8d49206419a..86fc95b62522277f461fdbc7a4a66aa6162c03ef 100644 (file)
--- 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();