X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageHandler.java;fp=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageHandler.java;h=cbe380028fad0ae43ecf2ebcc59c683ff0584588;hb=3e8bccd59c63f424052fcef5930e94a6629a1a95;hp=b23595a987b8e4a46cd7f55ba35871a40b40d355;hpb=61d78df4c74f93d77bc56eaa51280a8cead66209;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 b23595a9..cbe38002 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
@@ -22,8 +22,10 @@ package org.oransc.policyagent.dmaap;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
 
 import java.io.IOException;
+import java.util.Optional;
 
 import org.onap.dmaap.mr.client.MRBatchingPublisher;
 import org.oransc.policyagent.clients.AsyncRestClient;
@@ -94,8 +96,9 @@ public class DmaapMessageHandler {
     }
 
     private String payload(DmaapRequestMessage message) {
-        if (message.payload().isPresent()) {
-            return gson.toJson(message.payload().get());
+        Optional<JsonObject> payload = message.payload();
+        if (payload.isPresent()) {
+            return gson.toJson(payload.get());
         } else {
             logger.warn("Expected payload in message from DMAAP: {}", message);
             return "";