ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [30/37] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Date Tue, 20 Jan 2015 08:50:02 GMT
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4a64d435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a64d435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a64d435

Branch: refs/heads/sprint-1
Commit: 4a64d435441a2b45fb12e53c7c3c1305128b3918
Parents: 0652276
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jan 19 15:26:18 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jan 19 15:26:18 2015 +0300

----------------------------------------------------------------------
 .../grid/kernal/processors/continuous/GridContinuousProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a64d435/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
index fa121a5..6ec86a5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
@@ -696,7 +696,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
                     throw e;
                 }
 
-                fut.get(ackTimeout);
+                fut.get();
             }
             else {
                 Collection<Object> toSnd = info.add(obj);


Mime
View raw message