Author: thomasm
Date: Wed Oct 19 07:59:05 2016
New Revision: 1765547

URL: http://svn.apache.org/viewvc?rev=1765547&view=rev
Log:
OAK-4522 Improve CommitRateLimiter to optionally block some commits (fix test 
case; this is actually unrelated to changes in OAK-4522)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiterTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiterTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiterTest.java?rev=1765547&r1=1765546&r2=1765547&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiterTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/CommitRateLimiterTest.java
 Wed Oct 19 07:59:05 2016
@@ -96,7 +96,15 @@ public class CommitRateLimiterTest {
         try {
             limiter.processCommit(EMPTY_NODE, AFTER, null);
         } finally {
-            t.join();
+            try {
+                t.join();
+            } catch (InterruptedException e) {
+                // once in a while, we get a spurious 
+                // wakeup in the CommitRateLimiter,
+                // so that the Thresd.interrupt() above
+                // will reach t.join().
+                Thread.currentThread().interrupt();
+            }
             assertTrue(Thread.interrupted());
         }
     }


Reply via email to