From 5c6ab0422e445ba51b0851d08b38746a7c5cd1c3 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Tue, 3 Nov 2015 20:14:40 +0000 Subject: [PATCH] - fix compile issue --- .../java/org/bigbluebutton/api/MeetingService.java | 3 ++- .../api/messaging/MeetingMessageHandler.java | 13 ++++++++++--- .../api/messaging/messages/CreateBreakoutRoom.java | 8 +++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java index 796a8a8609..ea12da05ba 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java @@ -444,7 +444,8 @@ public class MeetingService implements MessageListener { private void processCreateBreakoutRoom(CreateBreakoutRoom message) { Map params = new HashMap(); params.put("name", message.name); - params.put("meetingID", message.meetingId); + params.put("breakoutId", message.breakoutId); + params.put("meetingID", message.parentId); params.put("attendeePW", message.viewerPassword); params.put("moderatorPW", message.moderatorPassword); params.put("voiceBridge", message.voiceConfId); diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java index fa3913c403..666a23eecd 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java @@ -69,9 +69,16 @@ public class MeetingMessageHandler implements MessageHandler { Gson gson = new Gson(); CreateBreakoutRoomRequest msg = gson.fromJson(message, CreateBreakoutRoomRequest.class); for (MessageListener listener : listeners) { - listener.handle(new CreateBreakoutRoom(msg.payload.meetingId, - msg.payload.name, msg.payload.voiceConfId, msg.payload.viewerPassword, - msg.payload.moderatorPassword, msg.payload.durationInMinutes, msg.payload.defaultPresentationURL)); + listener.handle(new CreateBreakoutRoom( + msg.payload.breakoutId, + msg.payload.parentId, + msg.payload.name, + msg.payload.voiceConfId, + msg.payload.viewerPassword, + msg.payload.moderatorPassword, + msg.payload.durationInMinutes, + msg.payload.defaultPresentationURL)); + } } } diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java index 5c674c4223..d9dcb3deba 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java @@ -3,7 +3,8 @@ package org.bigbluebutton.api.messaging.messages; public class CreateBreakoutRoom implements IMessage { - public final String meetingId; // The main meeting internal id + public final String breakoutId; + public final String parentId; // The main meeting internal id public final String name; // The name of the breakout room public final String voiceConfId; // The voice conference id public final String viewerPassword; @@ -11,10 +12,11 @@ public class CreateBreakoutRoom implements IMessage { public final Integer durationInMinutes; // The duration of the breakout room public final String defaultPresentationURL; - public CreateBreakoutRoom(String meetingId, String name, + public CreateBreakoutRoom(String breakoutId, String parentId, String name, String voiceConfId, String viewerPassword, String moderatorPassword, Integer duration, String defaultPresentationURL) { - this.meetingId = meetingId; + this.breakoutId = breakoutId; + this.parentId = parentId; this.name = name; this.voiceConfId = voiceConfId; this.viewerPassword = viewerPassword;