Issue #ditto/777: Fix a NullPointerException in ImmutableMessageSender.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Sep 4, 2020 · 0e35280 · 0e35280
1 parent c5b77ba
commit 0e35280
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/...src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java b/...src/main/java/org/eclipse/ditto/client/live/messages/internal/ImmutableMessageSender.java
@@ -232,7 +232,11 @@ private static <T> void checkPayloadTypeAndAccept(final Class<T> clazz,
             final BiConsumer<Message<T>, Throwable> responseMessageHandler,
             final Message<?> message,
             final Throwable error) {
-        if (message != null && message.getPayload().isPresent()) {
+        if (message != null && clazz.isAssignableFrom(ByteBuffer.class)) {
+            responseMessageHandler.accept(
+                    withPayload(message, message.getRawPayload().map(clazz::cast).orElse(null)),
+                    error);
+        } else if (message != null && message.getPayload().isPresent()) {
             final Object payload = message.getPayload().get();
             if (clazz.isInstance(payload)) {
                 responseMessageHandler.accept(withPayload(message, clazz.cast(payload)), error);
@@ -244,13 +248,7 @@ private static <T> void checkPayloadTypeAndAccept(final Class<T> clazz,
                 ));
             }
         } else if (message != null) {
-            if (clazz.isAssignableFrom(ByteBuffer.class)) {
-                responseMessageHandler.accept(
-                        withPayload(message, message.getRawPayload().map(clazz::cast).orElse(null)),
-                        error);
-            } else {
-                responseMessageHandler.accept(null, new NoSuchElementException("No payload"));
-            }
+            responseMessageHandler.accept(null, new NoSuchElementException("No payload"));
         } else {
             responseMessageHandler.accept(null, error);
         }

diff --git a/java/src/test/java/org/eclipse/ditto/client/DittoClientLiveTest.java b/java/src/test/java/org/eclipse/ditto/client/DittoClientLiveTest.java
@@ -527,7 +527,10 @@ private SendClaimMessage<String> claim() {
                 AbstractDittoClientTest.<String>newMessageBuilder(subject)
                         .payload(payload)
                         .build(),
-                DittoHeaders.newBuilder().randomCorrelationId().build());
+                DittoHeaders.newBuilder()
+                        .randomCorrelationId()
+                        .contentType("text/plain")
+                        .build());
     }
 
     private SendClaimMessageResponse<String> claimResponse() {
@@ -539,7 +542,9 @@ private SendClaimMessageResponse<String> claimResponse() {
                         .payload(responsePayload)
                         .build(),
                 responseStatus,
-                DittoHeaders.empty());
+                DittoHeaders.newBuilder()
+                        .contentType("text/plain")
+                        .build());
     }
 
     private SendFeatureMessage<String> featureMessage() {