svn commit: r1821487 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java test/java/org/apache/jackrabbit/oak/plugins/document/RevisionVectorTest.java

[mreutegg]

Author: mreutegg
Date: Thu Jan 18 11:36:29 2018
New Revision: 1821487

URL: http://svn.apache.org/viewvc?rev=1821487&view=rev
Log:
OAK-7176: RevisionVector from empty string throws 
StringIndexOutOfBoundsException

Fix and enable test

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionVectorTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java?rev=1821487&r1=1821486&r2=1821487&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
 Thu Jan 18 11:36:29 2018
@@ -360,6 +360,9 @@ public final class RevisionVector implem
      * @throws IllegalArgumentException if the string is malformed
      */
     public static RevisionVector fromString(String s) {
+        if (s.isEmpty()) {
+            return EMPTY;
+        }
         String[] list = s.split(",");
         Revision[] revisions = new Revision[list.length];
         for (int i = 0; i < list.length; i++) {

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionVectorTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionVectorTest.java?rev=1821487&r1=1821486&r2=1821487&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionVectorTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionVectorTest.java
 Thu Jan 18 11:36:29 2018
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugin
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static com.google.common.collect.Sets.newHashSet;
@@ -432,7 +431,6 @@ public class RevisionVectorTest {
         assertEquals(1, rv.getDimensions());
     }
 
-    @Ignore
     @Test
     public void emptyAsFromString() {
         RevisionVector empty = new RevisionVector();