IGNITE-2236: Fixed NPE in GridNearTxFinishFuture (doesn't relate to the ticket).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/384b3978 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/384b3978 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/384b3978 Branch: refs/heads/ignite-2236 Commit: 384b397862d6bc473989cffc4e58fd88c198b8e3 Parents: 92a236e Author: vozerov-gridgain <[email protected]> Authored: Wed Jan 20 13:34:31 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Jan 20 13:34:31 2016 +0300 ---------------------------------------------------------------------- .../near/GridNearTxFinishFuture.java | 26 +++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/384b3978/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 986fa9a..3c33bc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -643,16 +643,30 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu if (f.getClass() == FinishMiniFuture.class) { FinishMiniFuture fut = (FinishMiniFuture)f; - return "FinishFuture[node=" + fut.node().id() + - ", loc=" + fut.node().isLocal() + - ", done=" + fut.isDone() + "]"; + ClusterNode node = fut.node(); + + if (node != null) { + return "FinishFuture[node=" + node.id() + + ", loc=" + node.isLocal() + + ", done=" + fut.isDone() + ']'; + } + else { + return "FinishFuture[node=null, done=" + fut.isDone() + ']'; + } } else if (f.getClass() == CheckBackupMiniFuture.class) { CheckBackupMiniFuture fut = (CheckBackupMiniFuture)f; - return "CheckBackupFuture[node=" + fut.node().id() + - ", loc=" + fut.node().isLocal() + - ", done=" + f.isDone() + "]"; + ClusterNode node = fut.node(); + + if (node != null) { + return "CheckBackupFuture[node=" + node.id() + + ", loc=" + node.isLocal() + + ", done=" + f.isDone() + "]"; + } + else { + return "CheckBackupFuture[node=null, done=" + f.isDone() + "]"; + } } else if (f.getClass() == CheckRemoteTxMiniFuture.class) { CheckRemoteTxMiniFuture fut = (CheckRemoteTxMiniFuture)f;
