storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kabh...@apache.org
Subject [4/7] storm git commit: update version of Disruptor queue to 2.10.4, consumer of queue will use waitfor method without timeout
Date Thu, 16 Jul 2015 23:12:23 GMT
update version of Disruptor queue to 2.10.4, consumer of queue will use waitfor method without
timeout

Conflicts:
	storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/da76088a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/da76088a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/da76088a

Branch: refs/heads/0.10.x-branch
Commit: da76088a9bb6d6f223bf03ba4bc7c0ebd98defd8
Parents: b97a383
Author: errordaiwa <xingyusu@outlook.com>
Authored: Mon Jul 13 17:46:16 2015 +0800
Committer: Jungtaek Lim <kabhwan@gmail.com>
Committed: Fri Jul 17 07:58:29 2015 +0900

----------------------------------------------------------------------
 pom.xml                                                     | 2 +-
 storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/da76088a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5d9182c..da361f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,7 @@
         <snakeyaml.version>1.11</snakeyaml.version>
         <httpclient.version>4.3.3</httpclient.version>
         <clojure.tools.cli.version>0.2.4</clojure.tools.cli.version>
-        <disruptor.version>2.10.1</disruptor.version>
+        <disruptor.version>2.10.4</disruptor.version>
         <jgrapht.version>0.9.0</jgrapht.version>
         <guava.version>16.0.1</guava.version>
         <netty.version>3.9.0.Final</netty.version>

http://git-wip-us.apache.org/repos/asf/storm/blob/da76088a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
index 195c2f7..c4c936a 100644
--- a/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
+++ b/storm-core/src/jvm/backtype/storm/utils/DisruptorQueue.java
@@ -98,7 +98,7 @@ public class DisruptorQueue implements IStatefulObject {
     public void consumeBatchWhenAvailable(EventHandler<Object> handler) {
         try {
             final long nextSequence = _consumer.get() + 1;
-            final long availableSequence = _barrier.waitFor(nextSequence, _waitTimeout, TimeUnit.MILLISECONDS);
+            final long availableSequence = _barrier.waitFor(nextSequence);
             if(availableSequence >= nextSequence) {
                 consumeBatchToCursor(availableSequence, handler);
             }


Mime
View raw message