From eb601eef3e01671b6bfccbe8120d628fd3eaf89c Mon Sep 17 00:00:00 2001
From: Aron Engineer <aron.engineer1@gmail.com>
Date: Mon, 15 Mar 2021 22:34:54 +0000
Subject: [PATCH] fix: create meeting message order precedes group chat message
in akka-apps
---
.../scala/org/bigbluebutton/core/BigBlueButtonActor.scala | 4 ----
.../scala/org/bigbluebutton/core/running/MeetingActor.scala | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
index 8963b7057b..4bab7a2477 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -135,10 +135,6 @@ class BigBlueButtonActor(
RunningMeetings.add(meetings, m)
- // Send new 2x message
- val msgEvent = MsgBuilder.buildMeetingCreatedEvtMsg(m.props.meetingProp.intId, msg.body.props)
- m.outMsgRouter.send(msgEvent)
-
case Some(m) =>
log.info("Meeting already created. meetingID={}", msg.body.props.meetingProp.intId)
// do nothing
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
index 066935415b..e72b3f4bf8 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
@@ -156,6 +156,10 @@ class MeetingActor(
var lastRttTestSentOn = System.currentTimeMillis()
+ // Send new 2x message
+ val msgEvent = MsgBuilder.buildMeetingCreatedEvtMsg(liveMeeting.props.meetingProp.intId, liveMeeting.props)
+ outGW.send(msgEvent)
+
// Create a default public group chat
state = groupChatApp.handleCreateDefaultPublicGroupChat(state, liveMeeting, msgBus)
--
GitLab