Merge remote-tracking branch 'origin/test-training2' into test-training2
This commit is contained in:
commit
3974e96c99
@ -426,7 +426,10 @@ public class ConversationManagerService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private ConversationMessageVO sendChatMessage(Simulation simulation, Set<String> userIds, ConversationMessage conversationMessage) {
|
private ConversationMessageVO sendChatMessage(Simulation simulation, Set<String> userIds, ConversationMessage conversationMessage) {
|
||||||
Conversation conversation = simulation.getSimulationConversationMap().getOrDefault(CHAT_ROOM_KEY, createChatRoomConversation(simulation));
|
Conversation conversation = simulation.getSimulationConversationMap().get(CHAT_ROOM_KEY);
|
||||||
|
if (conversation != null) {
|
||||||
|
conversation = createChatRoomConversation(simulation);
|
||||||
|
}
|
||||||
conversation.getMessageList().add(conversationMessage);
|
conversation.getMessageList().add(conversationMessage);
|
||||||
ConversationMessageVO conversationMessageVO = new ConversationMessageVO(conversationMessage);
|
ConversationMessageVO conversationMessageVO = new ConversationMessageVO(conversationMessage);
|
||||||
SocketMessageVO<ConversationMessageVO> chatMessage =
|
SocketMessageVO<ConversationMessageVO> chatMessage =
|
||||||
|
Loading…
Reference in New Issue
Block a user