X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrResourceAdapter.java;h=ddff59c4caa38024706d3fa8e2682c109fc53f66;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;hp=c5225204b6ab03a6de81f529f3b0580c3aaf2d3a;hpb=28927a3628408ee59b5cde803975facea5df08ec;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java
index c5225204b..ddff59c4c 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrResourceAdapter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.jcr;
 
 import java.io.IOException;
@@ -114,14 +130,16 @@ public class JcrResourceAdapter {
 
 			Node fileNode = (Node) session().getItem(path);
 			Node contentNode = fileNode.getNode("jcr:content");
-			fileNode.checkout();
+			if (versioning)
+				fileNode.checkout();
 			contentNode.setProperty("jcr:data", in);
 			Calendar lastModified = Calendar.getInstance();
 			// lastModified.setTimeInMillis(file.lastModified());
 			contentNode.setProperty("jcr:lastModified", lastModified);
 
 			session().save();
-			fileNode.checkin();
+			if (versioning)
+				fileNode.checkin();
 
 			if (log.isDebugEnabled())
 				log.debug("Updated " + path);