X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatHome.java;h=bb4d89c5b4297ef86450a7a9592bfe95e3b983a3;hb=0e6fd57b277df31ef319f47c63bc182694e46082;hp=13f18b913fde4082b68823fb6d0a3d45b2e15b9d;hpb=f9b0d9a71a85741983a451a51fdbd1c38632be87;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
index 13f18b91..bb4d89c5 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
@@ -25,14 +25,15 @@ public class ChatHome
   {
     ChatRoom chatroom = service.createChatroom(UUID.randomUUID(), name);
     chatrooms.put(chatroom.getId(), chatroom);
-    return Mono.justOrEmpty(chatroom);
+    return Mono.just(chatroom);
   }
 
   public Mono<ChatRoom> getChatroom(UUID id)
   {
-    return Mono
-        .justOrEmpty(chatrooms.get(id))
-        .or(Mono.error(() -> new UnknownChatroomException(id)));
+    ChatRoom chatroom = chatrooms.get(id);
+    return chatroom == null
+        ? Mono.error(() -> new UnknownChatroomException(id))
+        : Mono.just(chatroom);
   }
 
   public Flux<ChatRoom> list()