From ce8f2ac28c40ad7b52d038a49e99970093c7c901 Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Tue, 21 May 2013 10:00:17 +0200 Subject: [PATCH] OO-610: fix NPE if the roster controller is null --- .../instantMessaging/ui/InstantMessagingMainController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/olat/instantMessaging/ui/InstantMessagingMainController.java b/src/main/java/org/olat/instantMessaging/ui/InstantMessagingMainController.java index 491f4e29dd5..fc880fb477e 100644 --- a/src/main/java/org/olat/instantMessaging/ui/InstantMessagingMainController.java +++ b/src/main/java/org/olat/instantMessaging/ui/InstantMessagingMainController.java @@ -336,7 +336,9 @@ public class InstantMessagingMainController extends BasicController implements G inAssessment = true; main.contextPut("inAssessment", true); chatMgrCtrl.closeAllChats(); - rosterPanelCtr.executeCloseCommand(); + if(rosterPanelCtr != null) { + rosterPanelCtr.executeCloseCommand(); + } } else if(event.getEventType().equals(AssessmentEvent.TYPE.STOPPED)) { OLATResourceable a = OresHelper.createOLATResourceableType(AssessmentInstance.class); if (singleUserEventCenter.getListeningIdentityCntFor(a) < 1) { -- GitLab