From 18de2abfe8edaae85595f40f64cdf17d0dbedefb Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Tue, 7 Sep 2010 17:10:20 -0700
Subject: [PATCH] bug 5147: more incremental checkins

---
 server/src/com/cloud/storage/StorageManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index d41da6cfda2..0b7ff4b675e 100644
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1998,6 +1998,9 @@ public class StorageManagerImpl implements StorageManager {
         	{
         		VMInstanceVO vmInstance = _vmInstanceDao.findById(volume.getInstanceId());
         		
+        		if(vmInstance == null)
+        			continue;
+        		
         		//shut down the running vms
         		if(vmInstance.getState().equals(State.Running) || vmInstance.getState().equals(State.Stopped) || vmInstance.getState().equals(State.Stopping) || vmInstance.getState().equals(State.Starting))
         		{