From 624e6520fa6d45b976e853f7e1b3613bfc20abe2 Mon Sep 17 00:00:00 2001
From: WangTaoTheTonic <wangtao111@huawei.com>
Date: Thu, 23 Apr 2015 15:07:14 +0800
Subject: [PATCH] fix break tests

---
 .../org/apache/spark/launcher/SparkSubmitCommandBuilder.java   | 3 ++-
 1 file changed, 2 insertions(+), 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
index 629200bcc3aea..698f2b4ec25e3 100644
--- 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"));
   }