From aa59b6f34d1156a97d4c3810885e18c7adcd444f Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Mon, 26 Aug 2013 11:04:28 -0700
Subject: [PATCH] CLOUDSTACK-4507: fix NPE when taking snapshot

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

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 e69881c6006..7d823a3b407 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: "