From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 10 Dec 2012 15:38:57 +0000 (+0000)
Subject: Fix issue with Jackrabbit container
X-Git-Tag: argeo-commons-2.1.30~709
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=06f918c09528d763a7c1664da5a3c28fcc77b580;p=lgpl%2Fargeo-commons.git

Fix issue with Jackrabbit container

git-svn-id: https://svn.argeo.org/commons/trunk@5944 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 4807f0951..7ed7737f8 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
@@ -193,7 +193,7 @@ public class JackrabbitWrapper extends JcrRepositoryWrapper implements
 			// actually imports the CND
 			CndImporter.registerNodeTypes(reader, session, true);
 
-			if (dataModel != null & !dataModel.isNodeType(NodeType.NT_FILE)) {
+			if (dataModel != null && !dataModel.isNodeType(NodeType.NT_FILE)) {
 				dataModel.remove();
 				dataModel = null;
 			}