Use short circuit operator

Dhruve Ashar · Dhruve Ashar · commit 3d2fac45f72d · 2016-09-21T17:37:28.000-05:00
diff --git a/core/src/main/scala/org/apache/spark/ExecutorAllocationClient.scala b/core/src/main/scala/org/apache/spark/ExecutorAllocationClient.scala
@@ -64,6 +64,6 @@ private[spark] trait ExecutorAllocationClient {
    */
   def killExecutor(executorId: String): Boolean = {
     val killedExecutors = killExecutors(Seq(executorId))
-    killedExecutors.nonEmpty & killedExecutors(0).equals(executorId)
+    killedExecutors.nonEmpty && killedExecutors(0).equals(executorId)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ private[spark] trait ExecutorAllocationClient {`
`64`	`64`	`*/`
`65`	`65`	`def killExecutor(executorId: String): Boolean = {`
`66`	`66`	`val killedExecutors = killExecutors(Seq(executorId))`
`67`		`- killedExecutors.nonEmpty & killedExecutors(0).equals(executorId)`
	`67`	`+ killedExecutors.nonEmpty && killedExecutors(0).equals(executorId)`
`68`	`68`	`}`
`69`	`69`	`}`