cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtutkow...@apache.org
Subject git commit: updated refs/heads/master to a298f6f
Date Thu, 09 Jan 2014 22:16:50 GMT
Updated Branches:
  refs/heads/master caf87ac5d -> a298f6fce


Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a298f6fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a298f6fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a298f6fc

Branch: refs/heads/master
Commit: a298f6fce994b45213be7d2b644b0e48a55c4b12
Parents: caf87ac
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Authored: Thu Jan 9 15:16:18 2014 -0700
Committer: Mike Tutkowski <mike.tutkowski@solidfire.com>
Committed: Thu Jan 9 15:16:18 2014 -0700

----------------------------------------------------------------------
 .../SolidFirePrimaryDataStoreLifeCycle.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a298f6fc/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
index d085ddc..c6e486b 100644
--- a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
+++ b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
@@ -171,12 +171,19 @@ public class SolidFirePrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeC
         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();
-        } else {
-            useMutualChapForVMware = Boolean.FALSE.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();
+            }
+        }
+        catch (Exception ex) {
         }
 
         details.put(SolidFireUtil.USE_MUTUAL_CHAP_FOR_VMWARE, useMutualChapForVMware);


Mime
View raw message