fix break tests

apache · Apr 23, 2015 · 624e652 · 624e652
1 parent 0565831
commit 624e652
Showing 1 changed file with 2 additions and 1 deletion.
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"));
   }