Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton

This commit is contained in:
Richard Alam 2012-01-09 19:01:00 +00:00
commit 785c7e6eec

View File

@ -272,7 +272,11 @@ public class MeetingService {
Meeting m = getMeeting(meetingId); Meeting m = getMeeting(meetingId);
if (m != null) { if (m != null) {
User user = m.userLeft(userId); User user = m.userLeft(userId);
log.debug("User removed from meeting:" + user.getFullname()); if(user != null){
log.debug("User removed from meeting:" + user.getFullname());
return;
}
log.warn("The participant " + userId + " doesn't exist in the meeting " + meetingId);
} }
} }
@ -281,8 +285,12 @@ public class MeetingService {
Meeting m = getMeeting(meetingId); Meeting m = getMeeting(meetingId);
if (m != null) { if (m != null) {
User user = m.getUserById(userId); User user = m.getUserById(userId);
user.setStatus(status, value); if(user != null){
log.debug("Setting new status value for participant:"+user.getFullname()); user.setStatus(status, value);
log.debug("Setting new status value for participant:"+user.getFullname());
return;
}
log.warn("The participant " + userId + " doesn't exist in the meeting " + meetingId);
} }
} }
} }