- BBB now starts properly on red5 r4582. Need a bit more testing though.

ritzalam · ritzalam · commit ece4ef7f1fac · 2013-03-08T22:49:11.000Z
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java
@@ -88,7 +88,7 @@ public void roomLeave(IClient client, IScope scope) {
 	public boolean roomConnect(IConnection connection, Object[] params) {
 		log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
 		
-		ISharedObject so = getSharedObject(connection.getScope(), LAYOUT_SO);
+		ISharedObject so = getSharedObject(connection.getScope(), LAYOUT_SO, false);
     	log.debug("Setting up Listener");
     	LayoutSender sender = new LayoutSender(so);
     	String room = connection.getScope().getName();
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
@@ -89,7 +89,7 @@ public boolean roomStart(IScope scope) {
 	public boolean roomConnect(IConnection connection, Object[] params) {
 		log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
 		 
-		ISharedObject so = getSharedObject(connection.getScope(), PARTICIPANTS_SO);
+		ISharedObject so = getSharedObject(connection.getScope(), PARTICIPANTS_SO, false);
     	ParticipantsEventSender sender = new ParticipantsEventSender(so);
     	ParticipantsEventRecorder recorder = new ParticipantsEventRecorder(connection.getScope().getName(), recorderApplication);
     			
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
@@ -82,26 +82,13 @@ public void appStop(IScope scope) {
 	public boolean roomConnect(IConnection connection, Object[] params) {
 		log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
 		
-		IScope scope = Red5.getConnectionLocal().getScope();
-		
-    	if (!hasSharedObject(scope, PRESENTATION_SO)) {
-    		if (createSharedObject(scope, PRESENTATION_SO, false)) {   
-    			ISharedObject so = getSharedObject(connection.getScope(), PRESENTATION_SO);
-    			
-    			log.debug("Setting up recorder");
-    			PresentationEventSender sender = new PresentationEventSender(so);
-    			PresentationEventRecorder recorder = new PresentationEventRecorder(connection.getScope().getName(), recorderApplication);
-    							
-    			log.debug("Adding room listener");
-    			presentationApplication.addRoomListener(connection.getScope().getName(), recorder);
-    			presentationApplication.addRoomListener(connection.getScope().getName(), sender);
-    			log.debug("Done setting up recorder and listener");
-    			return true;
-    		}
-    	}
-    			
-
-		return false;
+		ISharedObject so = getSharedObject(connection.getScope(), PRESENTATION_SO, false);
+		PresentationEventSender sender = new PresentationEventSender(so);
+		PresentationEventRecorder recorder = new PresentationEventRecorder(connection.getScope().getName(), recorderApplication);
+    	presentationApplication.addRoomListener(connection.getScope().getName(), recorder);
+    	presentationApplication.addRoomListener(connection.getScope().getName(), sender);
+    	
+    	return true;
 	}
 
 	@Override
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
@@ -98,7 +98,7 @@ public boolean roomStart(IScope scope) {
 	public boolean roomConnect(IConnection connection, Object[] params) {
 		log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
 		  			
-		ISharedObject so = getSharedObject(connection.getScope(), VOICE_SO);
+		ISharedObject so = getSharedObject(connection.getScope(), VOICE_SO, false);
 	    		
     	String voiceBridge = getBbbSession().getVoiceBridge();
     	String meetingid = getBbbSession().getConference(); 
