apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From david...@apache.org
Subject incubator-apex-malhar git commit: - MLHR-1864 #resolve #comment Additional patch to fix queues
Date Fri, 02 Oct 2015 21:24:19 GMT
Repository: incubator-apex-malhar
Updated Branches:
  refs/heads/devel-3 fd670e6d4 -> 6aa57ce08


 - MLHR-1864 #resolve #comment Additional patch to fix queues


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/6aa57ce0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/6aa57ce0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/6aa57ce0

Branch: refs/heads/devel-3
Commit: 6aa57ce084d1feb25a77e7e556f683b86766afb6
Parents: fd670e6
Author: Timothy Farkas <tim@datatorrent.com>
Authored: Fri Oct 2 13:26:13 2015 -0700
Committer: Timothy Farkas <tim@datatorrent.com>
Committed: Fri Oct 2 13:26:13 2015 -0700

----------------------------------------------------------------------
 .../lib/appdata/query/AbstractWindowEndQueueManager.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/6aa57ce0/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
b/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
index 951f591..8922a9e 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/query/AbstractWindowEndQueueManager.java
@@ -246,7 +246,7 @@ public abstract class AbstractWindowEndQueueManager<QUERY_TYPE, META_QUERY,
QUEU
   //Dirty hack TODO fix QueueManager interface
   public boolean isEmptyAndBlocked()
   {
-    return numLeft.get() == 0 && semaphore.availablePermits() == 0;
+    return numLeft.get() == 0 && semaphore.availablePermits() == 0 && semaphore.hasQueuedThreads();
   }
 
   private void acquire()


Mime
View raw message