Repository: incubator-apex-malhar Updated Branches: refs/heads/release-3.1 07078ec41 -> e41dfb696
- 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/e41dfb69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/e41dfb69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/e41dfb69 Branch: refs/heads/release-3.1 Commit: e41dfb696239e4eaab30a568868c5809721dfebd Parents: 07078ec Author: Timothy Farkas <[email protected]> Authored: Fri Oct 2 13:26:13 2015 -0700 Committer: Timothy Farkas <[email protected]> Committed: Fri Oct 2 13:28:52 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/e41dfb69/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()
