ZEPPELIN-501: fix NPE on Note creation by NotebookRepo, \wo DI constructor

bzz · bzz · commit 73a28bb5743f · 2015-12-23T11:50:35.000+09:00
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
@@ -133,6 +133,10 @@ public void setNotebookRepo(NotebookRepo repo) {
     this.repo = repo;
   }
 
+  public void setIndex(SearchService index) {
+    this.index = index;
+  }
+
   @SuppressWarnings("rawtypes")
   public Map<String, List<AngularObject>> getAngularObjects() {
     return angularObjects;
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -252,15 +252,14 @@ private Note loadNoteFromRepo(String id) {
       return null;
     }
 
-    // set NoteInterpreterLoader
+    //Manually inject ALL dependencies, as DI constructor was NOT used
+    note.setIndex(this.notebookIndex);
+
     NoteInterpreterLoader replLoader = new NoteInterpreterLoader(replFactory);
     note.setReplLoader(replLoader);
     replLoader.setNoteId(note.id());
 
-    // set JobListenerFactory
     note.setJobListenerFactory(jobListenerFactory);
-
-    // set notebookRepo
     note.setNotebookRepo(notebookRepo);
 
     Map<String, SnapshotAngularObject> angularObjectSnapshot = new HashMap<>();
