From a298f6fce994b45213be7d2b644b0e48a55c4b12 Mon Sep 17 00:00:00 2001 From: Mike Tutkowski Date: Thu, 9 Jan 2014 15:16:18 -0700 Subject: [PATCH] Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional --- .../SolidFirePrimaryDataStoreLifeCycle.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 d085ddc00a0..c6e486b05f2 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);