Repository: jclouds Updated Branches: refs/heads/master cd50ad905 -> 0e41b45af
Fix NPE when node is null Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0e41b45a Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0e41b45a Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0e41b45a Branch: refs/heads/master Commit: 0e41b45af598576821084c5bff2c54342ff860c6 Parents: cd50ad9 Author: Sergey Tselovalnikov <[email protected]> Authored: Tue May 17 14:39:44 2016 +0300 Committer: Ignasi Barrera <[email protected]> Committed: Tue May 17 16:46:24 2016 +0200 ---------------------------------------------------------------------- .../strategy/impl/AdaptingComputeServiceStrategies.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/0e41b45a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java index db24331..da38747 100644 --- a/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java +++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java @@ -144,21 +144,22 @@ public class AdaptingComputeServiceStrategies<N, H, I, L> implements CreateNodeW @Override public NodeMetadata rebootNode(String id) { NodeMetadata node = getNode(checkNotNull(id, "id")); - checkStateAvailable(node); + checkStateAvailable(id, node); client.rebootNode(id); // invalidate state of node return getNode(checkNotNull(id, "id")); } - private void checkStateAvailable(NodeMetadata node) { - checkState(node != null && node.getStatus() != Status.TERMINATED, + private void checkStateAvailable(String id, NodeMetadata node) { + checkState(node != null, "node with id %s terminated or unavailable!", id); + checkState(node.getStatus() != Status.TERMINATED, "node %s terminated or unavailable! current status: %s", node, formatStatus(node)); } @Override public NodeMetadata resumeNode(String id) { NodeMetadata node = getNode(checkNotNull(id, "id")); - checkStateAvailable(node); + checkStateAvailable(id, node); client.resumeNode(id); // invalidate state of node return getNode(checkNotNull(id, "id")); @@ -167,7 +168,7 @@ public class AdaptingComputeServiceStrategies<N, H, I, L> implements CreateNodeW @Override public NodeMetadata suspendNode(String id) { NodeMetadata node = getNode(checkNotNull(id, "id")); - checkStateAvailable(node); + checkStateAvailable(id, node); client.suspendNode(id); // invalidate state of node return getNode(checkNotNull(id, "id"));
