From 2350dd8586d0084d30b953fd9cdd8e14fec3856f Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Thu, 19 Mar 2020 13:05:39 +0100 Subject: [PATCH 1/1] Bugfix Dmaap responses without body Change-Id: If6887e0ad57a45b14c273ee4bb78e342cc41f183 Issue-ID: NONRTRIC-155 Signed-off-by: PatrikBuhr --- .../java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java index 6d1603c0..fc6e439a 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageHandler.java @@ -156,12 +156,12 @@ public class DmaapMessageHandler { HttpStatus status) { DmaapResponseMessage dmaapResponseMessage = ImmutableDmaapResponseMessage.builder() // .status(status.toString()) // - .message(response) // + .message(response == null ? "" : response) // .type("response") // - .correlationId(dmaapRequestMessage.correlationId()) // - .originatorId(dmaapRequestMessage.originatorId()) // - .requestId(dmaapRequestMessage.requestId()) // - .timestamp(dmaapRequestMessage.timestamp()) // + .correlationId(dmaapRequestMessage.correlationId() == null ? "" : dmaapRequestMessage.correlationId()) // + .originatorId(dmaapRequestMessage.originatorId() == null ? "" : dmaapRequestMessage.originatorId()) // + .requestId(dmaapRequestMessage.requestId() == null ? "" : dmaapRequestMessage.requestId()) // + .timestamp(dmaapRequestMessage.timestamp() == null ? "" : dmaapRequestMessage.timestamp()) // .build(); String str = gson.toJson(dmaapResponseMessage); return Mono.just(str); -- 2.16.6