optimize

Author: Pearl1594

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmStorageAdaptor.java

@@ -96,21 +96,21 @@ public boolean deleteStoragePool(String uuid) {
 
         if (decStoragePoolRefCount(uuid)) {
             logger.info("deleteStoragePool: CLVM/CLVM_NG storage pool {} still in use", uuid);
-            return true;
-        }
-
-        try {
-            return undefineInactiveClvmPool(LibvirtConnection.getConnection(), uuid);
-        } catch (LibvirtException e) {
-            throw new CloudRuntimeException(e.toString(), e);
+        } else {
+            try {
+                undefineInactiveClvmPool(LibvirtConnection.getConnection(), uuid);
+            } catch (LibvirtException e) {
+                throw new CloudRuntimeException(e.toString(), e);
+            }
         }
+        return true;
     }
 
-    private boolean undefineInactiveClvmPool(Connect conn, String uuid) throws LibvirtException {
+    private void undefineInactiveClvmPool(Connect conn, String uuid) throws LibvirtException {
         StoragePool sp = lookupClvmPool(conn, uuid);
         if (sp == null) {
             logger.warn("CLVM/CLVM_NG storage pool {} doesn't exist in libvirt. Assuming it is already removed", uuid);
-            return true;
+            return;
         }
 
         try {
@@ -124,7 +124,6 @@ private boolean undefineInactiveClvmPool(Connect conn, String uuid) throws Libvi
             sp.free();
         }
         logger.info("CLVM/CLVM_NG storage pool {} was successfully removed from libvirt", uuid);
-        return true;
     }
 
     private StoragePool lookupClvmPool(Connect conn, String uuid) throws LibvirtException {