Updated Branches: refs/heads/master-6-17-stable 0dc5245a6 -> 67cab313c
CLOUDSTACK-3399: fix NPE Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67cab313 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67cab313 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67cab313 Branch: refs/heads/master-6-17-stable Commit: 67cab313c969e5f488d6c0f92f9ec058288a96a0 Parents: 0dc5245 Author: Edison Su <[email protected]> Authored: Mon Jul 8 13:44:14 2013 -0700 Committer: Edison Su <[email protected]> Committed: Mon Jul 8 13:44:34 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/storage/motion/AncientDataMotionStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/67cab313/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java index 9bc5618..0a07ba9 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java +++ b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java @@ -501,7 +501,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { errMsg = e.toString(); } CopyCommandResult result = new CopyCommandResult(null, answer); - if (!answer.getResult()) { + if ((answer != null) && (!answer.getResult())) { if (answer.getDetails() != null) { result.setResult(answer.getDetails()); } else {
