Skip to content

Commit 9f1a879

Browse files
committed
Revert "Fix non-existent MFA cluster property caused NPE issue"
This reverts commit 46d6a16
1 parent a06857b commit 9f1a879

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/common/ClusterManagerEx.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,10 @@ List<IClusterDetail> loadAdditionalClusters() {
412412

413413
isListAdditionalClusterSuccess = false;
414414
Gson gson = new Gson();
415-
final String DEFAULT_EMPTY_JSON = "[]";
416-
String additionalClustersJson = DefaultLoader.getIdeHelper().getPropertyWithDefault(CommonConst.HDINSIGHT_ADDITIONAL_CLUSTERS, DEFAULT_EMPTY_JSON);
417-
String additionalMfaClustersJson = DefaultLoader.getIdeHelper().getPropertyWithDefault(CommonConst.HDINSIGHT_ADDITIONAL_MFA_CLUSTERS, DEFAULT_EMPTY_JSON);
418-
String livyLinkClustersJson = DefaultLoader.getIdeHelper().getPropertyWithDefault(CommonConst.HDINSIGHT_LIVY_LINK_CLUSTERS, DEFAULT_EMPTY_JSON);
419-
String sqlBigDataClustersJson = DefaultLoader.getIdeHelper().getPropertyWithDefault(CommonConst.SQL_BIG_DATA_LIVY_LINK_CLUSTERS, DEFAULT_EMPTY_JSON);
415+
String additionalClustersJson = DefaultLoader.getIdeHelper().getApplicationProperty(CommonConst.HDINSIGHT_ADDITIONAL_CLUSTERS);
416+
String additionalMfaClustersJson = DefaultLoader.getIdeHelper().getApplicationProperty(CommonConst.HDINSIGHT_ADDITIONAL_MFA_CLUSTERS);
417+
String livyLinkClustersJson = DefaultLoader.getIdeHelper().getApplicationProperty(CommonConst.HDINSIGHT_LIVY_LINK_CLUSTERS);
418+
String sqlBigDataClustersJson = DefaultLoader.getIdeHelper().getApplicationProperty(CommonConst.SQL_BIG_DATA_LIVY_LINK_CLUSTERS);
420419
if (!StringHelper.isNullOrWhiteSpace(additionalClustersJson) && !StringHelper.isNullOrWhiteSpace(livyLinkClustersJson)) {
421420
try {
422421
hdiAdditionalClusters = gson.fromJson(additionalClustersJson, new TypeToken<ArrayList<HDInsightAdditionalClusterDetail>>() {

0 commit comments

Comments
 (0)