Addressed the review comment

Devaraj K · Devaraj K · commit 49ac38ca8be9 · 2016-04-05T23:50:25.000+05:30
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -1452,12 +1452,8 @@ object Client extends Logging {
       conf: SparkConf,
       fs: FileSystem,
       appStagingDir: String): Path = {
-    val stagingRootDir = conf.get(STAGING_DIR).orNull
-    if (stagingRootDir != null) {
-      new Path(stagingRootDir, appStagingDir)
-    } else {
-      new Path(fs.getHomeDirectory, appStagingDir)
-    }
+    val baseDir = conf.get(STAGING_DIR).map { new Path(_) }.getOrElse(fs.getHomeDirectory())
+    new Path(baseDir, appStagingDir)
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1452,12 +1452,8 @@ object Client extends Logging {`
`1452`	`1452`	`conf: SparkConf,`
`1453`	`1453`	`fs: FileSystem,`
`1454`	`1454`	`appStagingDir: String): Path = {`
`1455`		`- val stagingRootDir = conf.get(STAGING_DIR).orNull`
`1456`		`- if (stagingRootDir != null) {`
`1457`		`- new Path(stagingRootDir, appStagingDir)`
`1458`		`- } else {`
`1459`		`- new Path(fs.getHomeDirectory, appStagingDir)`
`1460`		`- }`
	`1455`	`+ val baseDir = conf.get(STAGING_DIR).map { new Path(_) }.getOrElse(fs.getHomeDirectory())`
	`1456`	`+ new Path(baseDir, appStagingDir)`
`1461`	`1457`	`}`
`1462`	`1458`
`1463`	`1459`	`}`