- fix NPE when querying for annotations history

2012-08-17 14:41:42 +00:00 · 2012-08-17 14:41:42 +00:00 · 40dbd9bab5
commit 40dbd9bab5
parent 33fcacb00b
1 changed files with 1 additions and 0 deletions
--- 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 class WhiteboardRoom {
 	}
 	
 	public List<Annotation> getAnnotations() {
+		if (activePresentation == null) return new ArrayList<Annotation>();
 		return activePresentation.getActivePage().getAnnotations();
 	}