LIVY-131. NPE in LivyServer when starting LivyServer

Closes apache#116
wyfunique · Apr 25, 2016 · c3d5709 · c3d5709
1 parent 03209b4
commit c3d5709
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/src/main/scala/com/cloudera/livy/server/LivyServer.scala b/server/src/main/scala/com/cloudera/livy/server/LivyServer.scala
@@ -124,7 +124,9 @@ class LivyServer extends Logging {
   def join(): Unit = server.join()
 
   def stop(): Unit = {
-    server.stop()
+    if (server != null) {
+      server.stop()
+    }
   }
 
   def serverUrl(): String = {
@@ -193,6 +195,7 @@ object LivyServer {
   def main(args: Array[String]): Unit = {
     val server = new LivyServer()
     try {
+      server.start()
       server.join()
     } finally {
       server.stop()