fix break tests

WangTaoTheTonic · WangTaoTheTonic · commit 624e6520fa6d · 2015-04-23T15:07:14.000+08:00
diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java
@@ -308,7 +308,8 @@ private boolean isClientMode(Properties userProps) {
    * Return whether the given main class represents a thrift server.
    */
   private boolean isThriftServer(String mainClass) {
-    return mainClass.equals("org.apache.spark.sql.hive.thriftserver.HiveThriftServer2");
+    return (mainClass != null &&
+        mainClass.equals("org.apache.spark.sql.hive.thriftserver.HiveThriftServer2"));
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,8 @@ private boolean isClientMode(Properties userProps) {`
`308`	`308`	`* Return whether the given main class represents a thrift server.`
`309`	`309`	`*/`
`310`	`310`	`private boolean isThriftServer(String mainClass) {`
`311`		`- return mainClass.equals("org.apache.spark.sql.hive.thriftserver.HiveThriftServer2");`
	`311`	`+ return (mainClass != null &&`
	`312`	`+ mainClass.equals("org.apache.spark.sql.hive.thriftserver.HiveThriftServer2"));`
`312`	`313`	`}`
`313`	`314`
`314`	`315`