[exo-jcr-commits] exo-jcr SVN: r1981 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2010-03-02 10:26:27 -0500 (Tue, 02 Mar 2010)
New Revision: 1981

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java
Log:
EXOJCR-548: Added check, for situation when version history for the node already exists in version storage on the moment of import. 

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java	2010-03-01 23:12:24 UTC (rev 1980)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/util/VersionHistoryImporter.java	2010-03-02 15:26:27 UTC (rev 1981)
@@ -132,6 +132,12 @@
    {
       String path = versionableNode.getVersionHistory().getParent().getPath();
 
+      if (versionableNode.getVersionHistory().getParent().hasNode(versionHistory))
+      {
+         throw new RepositoryException("Can't import version history for node with identifier '" + versionHistory
+            + "', because it already exists in version storage.");
+      }
+
       NodeData versionable = (NodeData)versionableNode.getData();
       // ----- VERSIONABLE properties -----
       // jcr:versionHistory