use a different event

ivantchoff · Jul 5, 2013 · d26265b · d26265b
1 parent 2987659
commit d26265b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala b/bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
@@ -5,13 +5,13 @@ import org.bigbluebutton.core.api.Presenter
 import scala.collection.mutable.HashMap
 import org.bigbluebutton.core.api.UserJoining
 import org.bigbluebutton.core.api.UserLeaving
-import org.bigbluebutton.core.api.UserLeft
 import org.bigbluebutton.core.api.AssignPresenter
 import org.bigbluebutton.core.api.PresenterAssigned
 import org.bigbluebutton.core.User
 import org.bigbluebutton.core.api.MessageOutGateway
 import org.bigbluebutton.core.api.GetUsers
 import org.bigbluebutton.core.apps.users.messages.UserJoined
+import org.bigbluebutton.core.apps.users.messages.UserLeft
 import org.bigbluebutton.core.api.Role
 import org.bigbluebutton.core.api.UserVO
 import java.util.ArrayList
@@ -83,10 +83,13 @@ class UsersApp(meetingID: String, recorded: Boolean, outGW: MessageOutGateway) {
   }
 
   private def handleUserLeft(msg: UserLeaving):Unit = {
-	if (users.hasUser(msg.userID)) {
+	 if (users.hasUser(msg.userID)) {
 	  users.removeUser(msg.userID)
 	  outGW.send(new UserLeft(msg.meetingID, recorded, msg.userID))
-	}
+	 }
+   else{
+    println("This user is not here:" + msg.userID)
+   }
   }
 
   private def handleAssignPresenter(msg: AssignPresenter):Unit = {

diff --git a/...pps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala b/...pps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
@@ -7,7 +7,7 @@ import org.bigbluebutton.core.apps.users.messages.UserStatusChange
 import org.bigbluebutton.conference.service.messaging.MessagingConstants
 import com.google.gson.Gson
 import org.bigbluebutton.core.apps.users.messages.UserJoined
-import org.bigbluebutton.core.api.UserLeft
+import org.bigbluebutton.core.apps.users.messages.UserLeft
 
 class UsersEventRedisPublisher(service: MessageSender) extends OutMessageListener2 {
 
@@ -48,13 +48,15 @@ class UsersEventRedisPublisher(service: MessageSender) extends OutMessageListene
 		println("UsersEventRedisPublisher: end handleUserJoined")
 	}
 
-	private def handleUserLeft(msg: UserLeft) {		
+	private def handleUserLeft(msg: UserLeft) {
+		println("UsersEventRedisPublisher: init handleUserLeft")		
 		val map= new java.util.HashMap[String, String]();
 		map.put("meetingId", msg.meetingID);
 		map.put("messageId", MessagingConstants.USER_LEFT_EVENT);
 		map.put("internalUserId", msg.userID);
 
 		val gson= new Gson();
 		service.send(MessagingConstants.PARTICIPANTS_CHANNEL, gson.toJson(map));
+		println("UsersEventRedisPublisher: end handleUserLeft")
 	}
 }