refactored code

Signed-off-by: cindyyuanjiang <[email protected]>
NVIDIA · Oct 19, 2023 · 5d60350 · 5d60350
1 parent 3582fb7
commit 5d60350
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/AutoTuner.scala b/core/src/main/scala/com/nvidia/spark/rapids/tool/profiling/AutoTuner.scala
@@ -1035,11 +1035,11 @@ object AutoTuner extends Logging {
     representer.getPropertyUtils.setSkipMissingProperties(true)
     val constructor = new Constructor(classOf[ClusterProperties], new LoaderOptions())
     val yamlObjNested = new Yaml(constructor, representer)
-    val clusterPropsOpt = Option(yamlObjNested.load(clusterProps).asInstanceOf[ClusterProperties])
-    if (clusterPropsOpt.isDefined && clusterPropsOpt.get.softwareProperties == null) {
-      clusterPropsOpt.get.softwareProperties = new util.LinkedHashMap[String, String]()
+    val loadedClusterProps = yamlObjNested.load(clusterProps).asInstanceOf[ClusterProperties]
+    if (loadedClusterProps != null && loadedClusterProps.softwareProperties == null) {
+      loadedClusterProps.softwareProperties = new util.LinkedHashMap[String, String]()
     }
-    clusterPropsOpt
+    Option(loadedClusterProps)
   }
 
   def loadClusterProps(filePath: String): Option[ClusterProperties] = {