Merge remote-tracking branch 'origin/OpenOLAT_15.0'

src/main/java/org/olat/core/logging/activity/ThreadLocalUserActivityLogger.java

@@ -147,7 +147,7 @@ public class ThreadLocalUserActivityLogger {
 	public static void log(ILoggingAction loggingAction, Class<?> callingClass, ILoggingResourceable... loggingResourceables) {
 		IUserActivityLogger logger = userActivityLogger_.get();
 		if (logger==null) {
-			log_.error("No ThreadLocal IUserActivityLogger set - cannot log to database: "+loggingAction.getActionVerb());
+			log_.debug("No ThreadLocal IUserActivityLogger set - cannot log to database: {}", loggingAction.getActionVerb());
 		} else {
 			logger.log(loggingAction, callingClass, loggingResourceables);
 		}

src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonAdminController.java

@@ -145,13 +145,12 @@ public class BigBlueButtonAdminController extends BasicController implements Act
 	}
 	
 	private void doOpenConfiguration(UserRequest ureq) {
-		if(configCtrl == null) {
-			WindowControl bwControl = addToHistory(ureq, OresHelper.createOLATResourceableInstance("Configuration", 0l), null);
-			configCtrl = new BigBlueButtonConfigurationController(ureq, bwControl);
-			listenTo(configCtrl);
-		} else {
-			addToHistory(ureq, configCtrl);
-		}
+		removeAsListenerAndDispose(configCtrl);
+
+		WindowControl bwControl = addToHistory(ureq, OresHelper.createOLATResourceableInstance("Configuration", 0l), null);
+		configCtrl = new BigBlueButtonConfigurationController(ureq, bwControl);
+		listenTo(configCtrl);
+
 		mainVC.put("segmentCmp", configCtrl.getInitialComponent());
 	}