- fix NPE when querying for annotations history

ritzalam · ritzalam · commit 40dbd9bab538 · 2012-08-17T14:41:42.000Z
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
@@ -91,6 +91,7 @@ public void addAnnotation(Annotation annotation) {
 	}
 	
 	public List<Annotation> getAnnotations() {
+		if (activePresentation == null) return new ArrayList<Annotation>();
 		return activePresentation.getActivePage().getAnnotations();
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ public void addAnnotation(Annotation annotation) {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public List<Annotation> getAnnotations() {`
	`94`	`+ if (activePresentation == null) return new ArrayList<Annotation>();`
`94`	`95`	`return activePresentation.getActivePage().getAnnotations();`
`95`	`96`	`}`
`96`	`97`