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 2018/11/01 08:53:06 UTC
svn commit: r1845415 -
/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
Author: mduerig
Date: Thu Nov 1 08:53:05 2018
New Revision: 1845415
URL: http://svn.apache.org/viewvc?rev=1845415&view=rev
Log:
OAK-7867: Flush thread gets stuck when input stream of binaries block
Improve synchronisation of blocking blob in test
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java?rev=1845415&r1=1845414&r2=1845415&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java Thu Nov 1 08:53:05 2018
@@ -295,7 +295,14 @@ public class FileStoreIT {
private int readOrEnd() {
if (blocking.get()) {
- reading = true;
+ if (!reading) {
+ readMonitor.enter();
+ try {
+ reading = true;
+ } finally {
+ readMonitor.leave();
+ }
+ }
return 0;
} else {
return -1;