cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [4/7] git commit: updated refs/heads/master to 4fd09cb
Date Mon, 19 Aug 2013 22:26:41 GMT
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/0040c4ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0040c4ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0040c4ad

Branch: refs/heads/master
Commit: 0040c4adef4f7b92aa63737a8f2c5405a07fabda
Parents: 1c96898
Author: Edison Su <edison.su@citrix.com>
Authored: Sat Aug 17 17:33:04 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Mon Aug 19 15:25:20 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/0040c4ad/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