diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java index e8d74a8730865456d7c4fe196f7e77efc77e46e4..545f7ad5301a887d63b6e64b8d1e434ade603b02 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ApiErrors.java @@ -36,6 +36,10 @@ public class ApiErrors { errors.add(new String[] {"NotUniqueMeetingID", "A meeting already exists with that meeting ID. Please use a different meeting ID."}); } + public void nonUniqueVoiceBridgeError() { + errors.add(new String[] {"nonUniqueVoiceBridge", "The selected voice bridge is already in use."}); + } + public void invalidMeetingIdError() { errors.add(new String[] {"invalidMeetingId", "The meeting ID that you supplied did not match any existing meetings"}); } diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java index d73e1783bfc62e484e260482ab4290267bf8844b..adff3ac4616bc09b4548d55046439796735269fe 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java @@ -457,7 +457,7 @@ public class MeetingService implements MessageListener { return null; for (Map.Entry<String, Meeting> entry : meetings.entrySet()) { Meeting m = entry.getValue(); - if (m.getTelVoice() == telVoice) { + if (telVoice.equals(m.getTelVoice())) { if (!m.isForciblyEnded()) return m; } @@ -470,7 +470,7 @@ public class MeetingService implements MessageListener { return null; for (Map.Entry<String, Meeting> entry : meetings.entrySet()) { Meeting m = entry.getValue(); - if (m.getWebVoice() == webVoice) { + if (webVoice.equals(m.getWebVoice())) { if (!m.isForciblyEnded()) return m; } diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy index 221dd716b97f5207b2791a757dd4f572919513ac..61d5d76220a7039f60dab79b7051f9a13fefbe01 100755 --- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy +++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy @@ -186,7 +186,7 @@ class ApiController { Meeting existingWebVoice = meetingService.getNotEndedMeetingWithWebVoice(newMeeting.getWebVoice()); if (existingTelVoice != null || existingWebVoice != null) { log.error "VoiceBridge already in use by another meeting (different meetingId)" - errors.nonUniqueMeetingIdError() + errors.nonUniqueVoiceBridgeError() respondWithErrors(errors) } }