Repository: ignite Updated Branches: refs/heads/ignite-1607 b1eb21c0c -> bea8f9ead
ignite-1607 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bea8f9ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bea8f9ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bea8f9ea Branch: refs/heads/ignite-1607 Commit: bea8f9eada3d9ea096408d8b79cb03caf6bc18c5 Parents: b1eb21c Author: sboikov <[email protected]> Authored: Tue Oct 27 18:14:02 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Oct 27 18:14:02 2015 +0300 ---------------------------------------------------------------------- .../near/GridNearOptimisticTxPrepareFuture.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bea8f9ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 5b4e2bb..af43113 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -650,7 +650,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa try { fut.get(); - remap(res); + remap(); } catch (IgniteCheckedException e) { onDone(e); @@ -659,7 +659,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa }); } else - remap(res); + remap(); } else { onPrepareResponse(m, res); @@ -669,19 +669,19 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa proceedPrepare(mappings); // Finish this mini future. - onDone(res); + onDone((GridNearTxPrepareResponse)null); } } } } /** - * @param res Response. + * */ - private void remap(final GridNearTxPrepareResponse res) { + private void remap() { prepareOnTopology(true, new Runnable() { @Override public void run() { - onDone(res); + onDone((GridNearTxPrepareResponse)null); } }); }
