svn commit: r1573571 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java

[mduerig]

Author: mduerig
Date: Mon Mar  3 14:32:39 2014
New Revision: 1573571

URL: http://svn.apache.org/r1573571
Log:
OAK-1486: BackgroundObserverTest occasionally failing
- Revert to previous timeout value
- Omit redundant check for whether the current future is done

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java?rev=1573571&r1=1573570&r2=1573571&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserver.java
 Mon Mar  3 14:32:39 2014
@@ -260,9 +260,7 @@ public class BackgroundObserver implemen
          */
         public void onComplete(Runnable task) {
             this.task = task;
-            if (isDone()) {
-                run(task);
-            }
+            run(task);
         }
 
         @Override

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java?rev=1573571&r1=1573570&r2=1573571&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java
 Mon Mar  3 14:32:39 2014
@@ -59,7 +59,7 @@ public class BackgroundObserverTest {
         }
         done(observer);
 
-        assertTrue(doneCounter.await(5, TimeUnit.MINUTES));
+        assertTrue(doneCounter.await(5, TimeUnit.SECONDS));
 
         for (Runnable assertion : concat(assertionLists)) {
             assertion.run();