cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/4.2 to e3a6657
Date Sun, 18 Aug 2013 00:33:27 GMT
Updated Branches:
  refs/heads/4.2 bc584062f -> e3a6657c9


CLOUDSTACK-4363: fix possible NPE, if copy volume failed.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e3a6657c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e3a6657c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e3a6657c

Branch: refs/heads/4.2
Commit: e3a6657c933e795a0b69a0d6461d2ea921d5db10
Parents: bc58406
Author: Edison Su <edison.su@citrix.com>
Authored: Sat Aug 17 17:33:04 2013 -0700
Committer: Edison Su <edison.su@citrix.com>
Committed: Sat Aug 17 17:33:17 2013 -0700

----------------------------------------------------------------------
 .../src/org/apache/cloudstack/storage/volume/VolumeObject.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e3a6657c/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
index b24b715..f5a1276 100644
--- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
+++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
@@ -335,7 +335,11 @@ public class VolumeObject implements VolumeInfo {
             return this.volumeVO.getPath();
         } else {
             DataObjectInStore objInStore = this.objectInStoreMgr.findObject(this, dataStore);
-            return objInStore.getInstallPath();
+            if (objInStore != null) {
+                return objInStore.getInstallPath();
+            } else {
+                return null;
+            }
         }
     }
 


Mime
View raw message