Repository: incubator-ignite Updated Branches: refs/heads/ignite-9655-merge 109dbe764 -> 16c3cceeb
Ignite-9655-merge - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/16c3ccee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/16c3ccee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/16c3ccee Branch: refs/heads/ignite-9655-merge Commit: 16c3cceeb2e5110832b34d8b77596036071c2f4c Parents: 109dbe7 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Feb 14 19:59:59 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Feb 14 19:59:59 2015 -0800 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/16c3ccee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 8fb8a28..bcecc96 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -529,23 +529,22 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu if (replied.compareAndSet(false, true)) { try { sendPrepareResponse(createPrepareResponse()); - - return true; } catch (IgniteCheckedException e) { - onError(e); - - return true; + U.error(log, "Failed to send prepare response for transaction: " + tx, e); } finally { // Will call super.onDone(). onComplete(); } + + return true; } else { // Other thread is completing future. Wait for it to complete. try { - get(); + if (err != null) + get(); } catch (IgniteInterruptedException e) { onError(new IgniteCheckedException("Got interrupted while waiting for replies to be sent.", e));
