code improvements

Author: sureshanaparti

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

@@ -630,7 +630,7 @@ private Map<String, String> getSDCDetails(Map<String, String> details) {
             return sdcDetails;
         }
 
-        int waitTimeInSecs = 5;
+        int numberOfTries = 5;
         int timeBetweenTries = 1000; // Try more frequently (every sec) and return early when SDC Id or Guid found
         do {
             String sdcId = ScaleIOUtil.getSdcId(storageSystemId);
@@ -649,8 +649,8 @@ private Map<String, String> getSDCDetails(Map<String, String> details) {
                 Thread.sleep(timeBetweenTries);
             } catch (Exception ignore) {
             }
-            waitTimeInSecs--;
-        } while (waitTimeInSecs > 0);
+            numberOfTries--;
+        } while (numberOfTries > 0);
 
         return sdcDetails;
     }

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java

@@ -381,6 +381,9 @@ private boolean isHostSdcConnected(String sdcId, long poolId) {
 
     private ScaleIOGatewayClient getScaleIOClient(final Long storagePoolId) throws Exception {
         StoragePoolVO storagePool = storagePoolDao.findById(storagePoolId);
+        if (storagePool == null) {
+            throw new CloudRuntimeException("Unable to find the storage pool with id " + storagePoolId);
+        }
         return ScaleIOGatewayClientConnectionPool.getInstance().getClient(storagePool, storagePoolDetailsDao);
     }