X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageHandler.java;h=c50a46fa091ec39f6733b3930c2ab74ff45e92f4;hb=ad3dbd1a9bb1f0a9d5f90be7e5dfe835ae6c1a41;hp=7125135e731bca2f29c52fd365636a1317de5975;hpb=2b05f15336c57960af51e3a6cbf5705b6b88c4fd;p=nonrtric.git

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 7125135e..c50a46fa 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
@@ -57,10 +57,12 @@ public class DmaapMessageHandler {
     }
 
     public void handleDmaapMsg(String msg) {
-        this.createTask(msg) //
-            .subscribe(message -> logger.debug("handleDmaapMsg: {}", message), //
-                throwable -> logger.warn("handleDmaapMsg failure {}", throwable.getMessage()), //
-                () -> logger.debug("handleDmaapMsg complete"));
+        try {
+            String result = this.createTask(msg).block();
+            logger.debug("handleDmaapMsg: {}", result);
+        } catch (Exception throwable) {
+            logger.warn("handleDmaapMsg failure {}", throwable.getMessage());
+        }
     }
 
     Mono<String> createTask(String msg) {
@@ -71,8 +73,8 @@ public class DmaapMessageHandler {
                 .flatMap(
                     response -> sendDmaapResponse(response.getBody(), dmaapRequestMessage, response.getStatusCode()));
         } catch (Exception e) {
-            logger.warn("Received unparsable message from DMAAP: {}", msg);
-            return Mono.error(e); // Cannot make any response
+            String errorMsg = "Received unparsable message from DMAAP: \"" + msg + "\", reason: " + e.getMessage();
+            return Mono.error(new ServiceException(errorMsg)); // Cannot make any response
         }
     }