[exo-jcr-commits] exo-jcr SVN: r290 - jcr/trunk/component/webdav/src/main/java/org/exoplatform/services/jcr/webdav/command.

[do-not-reply at jboss.org]

Author: dkatayev
Date: 2009-10-16 09:40:34 -0400 (Fri, 16 Oct 2009)
New Revision: 290

Modified:
   jcr/trunk/component/webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java
Log:
EXOJCR-28 fixed bug in PUT method.

Modified: jcr/trunk/component/webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java
===================================================================
--- jcr/trunk/component/webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java	2009-10-16 12:46:33 UTC (rev 289)
+++ jcr/trunk/component/webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/PutCommand.java	2009-10-16 13:40:34 UTC (rev 290)
@@ -91,7 +91,8 @@
             nullResourceLocks.checkLock(session, path, tokens);
          }
 
-         if (node == null || "add".equals(updatePolicyType))
+         //if (node == null || "add".equals(updatePolicyType))
+         if (node == null)
          {
 
             node = session.getRootNode().addNode(TextUtil.relativizePath(path), fileNodeType);
@@ -103,15 +104,16 @@
          {
             if ("add".equals(updatePolicyType))
             {
-               node = session.getRootNode().addNode(TextUtil.relativizePath(path), fileNodeType);
+               node = session.getRootNode().getNode(TextUtil.relativizePath(path));
                if (!node.isNodeType("mix:versionable"))
                {
+                  node = session.getRootNode().addNode(TextUtil.relativizePath(path), fileNodeType);
                   node.addNode("jcr:content", contentNodeType);
                   updateContent(node, inputStream, mimeType, encoding, mixins);
                }
                else
                {
-                  updateVersion(node, inputStream, mimeType, autoVersion, encoding, mixins);
+                  updateVersion(node, inputStream, mimeType, encoding, autoVersion, mixins);
                }
 
             }
@@ -127,7 +129,7 @@
                }
                else
                {
-                  updateVersion(node, inputStream, mimeType, autoVersion, encoding, mixins);
+                  updateVersion(node, inputStream, mimeType, encoding, autoVersion, mixins);
                }
             }
          }