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 mr...@apache.org on 2018/11/28 07:58:26 UTC
svn commit: r1847619 -
/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java
Author: mreutegg
Date: Wed Nov 28 07:58:26 2018
New Revision: 1847619
URL: http://svn.apache.org/viewvc?rev=1847619&view=rev
Log:
OAK-7869: Commit queue stuck when input stream of blob blocks
Simplify blocking test stream
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java?rev=1847619&r1=1847618&r2=1847619&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreIT.java Wed Nov 28 07:58:26 2018
@@ -214,16 +214,7 @@ public class DocumentNodeStoreIT extends
@Override
public int read() {
- return readOrEnd();
- }
-
- @Override
- public int read(@NotNull byte[] b, int off, int len) {
- return readOrEnd();
- }
-
- private int readOrEnd() {
- if (blocking.get()) {
+ while (blocking.get()) {
if (!reading) {
readMonitor.enter();
try {
@@ -232,17 +223,15 @@ public class DocumentNodeStoreIT extends
readMonitor.leave();
}
}
- return 0;
- } else {
- return -1;
}
+ return -1;
}
};
}
@Override
public long length() {
- return 1;
+ return -1;
}
}