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 st...@apache.org on 2017/02/08 16:49:53 UTC
svn commit: r1782218 - in /jackrabbit/oak/branches/1.2/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
Author: stefanegli
Date: Wed Feb 8 16:49:53 2017
New Revision: 1782218
URL: http://svn.apache.org/viewvc?rev=1782218&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.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1782218&r1=1782217&r2=1782218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Wed Feb 8 16:49:53 2017
@@ -1894,7 +1894,7 @@ public final class DocumentNodeStore
// add changes for this particular clusterId to the externalSort
try {
fillExternalChanges(externalSort, last, r, store);
- } 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.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java?rev=1782218&r1=1782217&r2=1782218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalGCTest.java Wed Feb 8 16:49:53 2017
@@ -14,7 +14,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -43,7 +42,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);