소스 검색

[livy] Fix a null pointer

Erick Tryzelaar 10 년 전
부모
커밋
7d56a97e7a
2개의 변경된 파일2개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 6
      apps/spark/java/livy-server/pom.xml
  2. 2 2
      apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/Main.scala

+ 0 - 6
apps/spark/java/livy-server/pom.xml

@@ -70,12 +70,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.4.4</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

+ 2 - 2
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/Main.scala

@@ -48,14 +48,14 @@ class ScalatraBootstrap extends LifeCycle {
   var sessionManager: SessionManager = null
 
   override def init(context: ServletContext): Unit = {
-    context.mount(new WebApp(sessionManager), "/*")
-
     val sessionFactory = context.getInitParameter(Main.SESSION_KIND) match {
       case Main.PROCESS_SESSION => new ProcessSessionFactory
       case Main.YARN_SESSION => new YarnSessionFactory
     }
 
     sessionManager = new SessionManager(sessionFactory)
+
+    context.mount(new WebApp(sessionManager), "/*")
   }
 
   override def destroy(context: ServletContext): Unit = {