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 fr...@apache.org on 2018/04/25 12:54:38 UTC

svn commit: r1830071 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java

Author: frm
Date: Wed Apr 25 12:54:38 2018
New Revision: 1830071

URL: http://svn.apache.org/viewvc?rev=1830071&view=rev
Log:
OAK-7449 - Fix ObservationQueueFullWarnTest#testQueueFullThenFlushing

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java?rev=1830071&r1=1830070&r2=1830071&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationQueueFullWarnTest.java Wed Apr 25 12:54:38 2018
@@ -266,11 +266,12 @@ public class ObservationQueueFullWarnTes
                             + counter.get());
                     hasReceivedTestMessage.set(true);
                     semaphore.acquire();
-                    long numEvents = events.getSize();
+                    long numEvents = 0;
                     counter.addAndGet(numEvents);
-                    LOG.info("GOT: " + numEvents + " - COUNTER: " + counter.get());
                     while (events.hasNext()) {
                         Event e = events.nextEvent();
+                        counter.incrementAndGet();
+                        numEvents++;
                         LOG.info(" - " + e);
                         if (PathUtils.getName(e.getPath()).startsWith("local")) {
                             if (e instanceof JackrabbitEvent && !((JackrabbitEvent) e).isExternal()) {
@@ -278,6 +279,7 @@ public class ObservationQueueFullWarnTes
                             }
                         }
                     }
+                    LOG.info("GOT: " + numEvents + " - COUNTER: " + counter.get());
                 } else {
                     // we should get only "init" as the relevant message we're waiting for
                     // as other would be dispatched once we've got init