gitqueue
diff --git a/‎plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java‎
Lines changed: 11 additions & 5 deletions b/‎plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java‎
Lines changed: 11 additions & 5 deletions
@@ -168,13 +168,19 @@ public DataStore initialize(Map<String, Object> dsInfos) {
         details.put(SolidFireUtil.CLUSTER_DEFAULT_MAX_IOPS, String.valueOf(lClusterDefaultMaxIops));
         details.put(SolidFireUtil.CLUSTER_DEFAULT_BURST_IOPS_PERCENT_OF_MAX_IOPS, String.valueOf(fClusterDefaultBurstIopsPercentOfMaxIops));
 
-        String useMutualChapForVMware = getValue(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, url);
+        String useMutualChapForVMware = Boolean.TRUE.toString();
 
-        if (useMutualChapForVMware == null || new Boolean(useMutualChapForVMware)) {
-            useMutualChapForVMware = Boolean.TRUE.toString();
+        try {
+            useMutualChapForVMware = getValue(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, url);
+
+            if (useMutualChapForVMware == null || new Boolean(useMutualChapForVMware)) {
+                useMutualChapForVMware = Boolean.TRUE.toString();
+            }
+            else {
+                useMutualChapForVMware = Boolean.FALSE.toString();
+            }
         }
-        else {
-            useMutualChapForVMware = Boolean.FALSE.toString();
+        catch (Exception ex) {
         }
 
         details.put(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, useMutualChapForVMware);