svn commit: r1402086 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexUpdate.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java

[mreutegg]

Author: mreutegg
Date: Thu Oct 25 10:35:18 2012
New Revision: 1402086

URL: http://svn.apache.org/viewvc?rev=1402086&view=rev
Log:
OAK-398: Moving referenceable node fails with 'Uniqueness constraint violated'

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexUpdate.java
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexUpdate.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexUpdate.java?rev=1402086&r1=1402085&r2=1402086&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexUpdate.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexUpdate.java
 Thu Oct 25 10:35:18 2012
@@ -89,9 +89,9 @@ class PropertyIndexUpdate {
             Set<String> paths = entry.getValue();
             PropertyState property = index.getProperty(encoded);
             if (property != null) {
-                PropertyBuilder<String> builder = 
MemoryPropertyBuilder.create(Type.STRING).setName(encoded);
+                PropertyBuilder<String> builder = 
MemoryPropertyBuilder.create(Type.STRING, encoded);
                 for (String value : property.getValue(Type.STRINGS)) {
-                    if (!paths.contains(builder)) {
+                    if (!paths.contains(value)) {
                         builder.addValue(value);
                     }
                 }

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1402086&r1=1402085&r2=1402086&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
 Thu Oct 25 10:35:18 2012
@@ -1374,7 +1374,6 @@ public class RepositoryTest extends Abst
     }
 
     @Test
-    @Ignore("OAK-398")
     public void moveReferenceable() throws RepositoryException {
         Session session = getAdminSession();