From 5f06654b389db31179858f785735db8c99d45764 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Thu, 13 Jan 2011 13:22:54 -0800
Subject: [PATCH] bug 7960: the npe should be fixed with my previous fix.
 adding better logging and some exception handling status 7960: resolved fixed

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

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 254844457bb..550bc7cdcbc 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -2441,7 +2441,12 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
             destroyVolume(volume);
         }
         
-        expungeVolume(volume);
+        try {
+			expungeVolume(volume);
+		} catch (Exception e) {
+			s_logger.warn("Failed to expunge volume:"+e);
+			return false;
+		}
         
         return true;
 	}