You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/10/25 13:11:58 UTC

svn commit: r1766527 - in /jackrabbit/oak/trunk/oak-run/src: main/java/org/apache/jackrabbit/oak/console/SegmentTarFixture.java test/java/org/apache/jackrabbit/oak/console/SegmentTarFixtureTest.java

Author: mduerig
Date: Tue Oct 25 13:11:58 2016
New Revision: 1766527

URL: http://svn.apache.org/viewvc?rev=1766527&view=rev
Log:
OAK-4999: ISE when starting Oak Console

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/SegmentTarFixture.java
    jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/console/SegmentTarFixtureTest.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/SegmentTarFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/SegmentTarFixture.java?rev=1766527&r1=1766526&r2=1766527&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/SegmentTarFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/console/SegmentTarFixture.java Tue Oct 25 13:11:58 2016
@@ -43,11 +43,8 @@ class SegmentTarFixture implements NodeS
 
         try {
             if (readOnly) {
-                ReadOnlyFileStore store;
-                store = builder.buildReadOnly();
-                return new SegmentTarFixture(store);
+                return new SegmentTarFixture(builder.buildReadOnly());
             } else {
-                FileStore store = builder.build();
                 return new SegmentTarFixture(builder.build());
             }
         } catch (InvalidFileStoreVersionException e) {

Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/console/SegmentTarFixtureTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/console/SegmentTarFixtureTest.java?rev=1766527&r1=1766526&r2=1766527&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/console/SegmentTarFixtureTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/console/SegmentTarFixtureTest.java Tue Oct 25 13:11:58 2016
@@ -38,7 +38,6 @@ public class SegmentTarFixtureTest {
     public TemporaryFolder folder = new TemporaryFolder(new File("target"));
 
     @Test
-    @Ignore("OAK-4999")  // FIXME OAK-4999
     public void testReadWrite() throws IOException, CommitFailedException {
         try (NodeStoreFixture fixture = SegmentTarFixture.create(folder.getRoot(), false, null)) {
             NodeStore store = fixture.getStore();