cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [12/34] git commit: updated refs/heads/ui-restyle to 23093ed
Date Thu, 26 Sep 2013 18:03:13 GMT
CLOUDSTACK-4507: fix NPE when taking snapshot


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

Branch: refs/heads/ui-restyle
Commit: aa59b6f34d1156a97d4c3810885e18c7adcd444f
Parents: f4dbf87
Author: Edison Su <sudison@gmail.com>
Authored: Mon Aug 26 11:04:28 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Sep 25 16:09:00 2013 -0700

----------------------------------------------------------------------
 .../src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa59b6f3/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
index e69881c..7d823a3 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
@@ -265,7 +265,7 @@ public class SnapshotObject implements SnapshotInfo {
                 this.snapshotStoreDao.update(snapshotStore.getId(), snapshotStore);
                 
                 // update side-effect of snapshot operation
-                if(snapshotTO.getVolume().getPath() != null) {
+                if(snapshotTO.getVolume() != null && snapshotTO.getVolume().getPath()
!= null) {
                 	VolumeVO vol = this.volumeDao.findByUuid(snapshotTO.getVolume().getUuid());
                 	if(vol != null) {
 	                	s_logger.info("Update volume path change due to snapshot operation, volume
" + vol.getId() + " path: "


Mime
View raw message