svn commit: r1782208 - in /jackrabbit/oak/branches/1.6/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java

[stefanegli]

Author: stefanegli
Date: Wed Feb  8 15:26:09 2017
New Revision: 1782208

URL: http://svn.apache.org/viewvc?rev=1782208&view=rev
Log:
OAK-5601 : merged from trunk: fixed the missing journal entry exception by 
catching Exception instead of IOException

Modified:
    
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
    
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java

Modified: 
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1782208&r1=1782207&r2=1782208&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Wed Feb  8 15:26:09 2017
@@ -2023,7 +2023,7 @@ public final class DocumentNodeStore
                         // add changes for this particular clusterId to the 
externalSort
                         try {
                             fillExternalChanges(externalSort, 
PathUtils.ROOT_PATH, last, r, store, changeSetBuilder, journalPropertyHandler);
-                        } catch (IOException e1) {
+                        } catch (Exception e1) { // OAK-5601 : catch any 
Exception, not only IOException
                             LOG.error("backgroundRead: Exception while reading 
external changes from journal: " + e1, e1);
                             IOUtils.closeQuietly(externalSort);
                             externalSort = null;

Modified: 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java?rev=1782208&r1=1782207&r2=1782208&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
 Wed Feb  8 15:26:09 2017
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -149,7 +148,6 @@ public class JournalGCTest {
      * thus end up missing by later on in addTo.
      */
     @Test
-    @Ignore("OAK-5601")
     public void gcCausingMissingJournalEntries() throws Exception {
         // cluster setup
         final Semaphore enteringFind = new Semaphore(0);