NPE fixed

Signed-off-by: sezen.leblay <[email protected]>

Author: sezen-datadog

dd-java-agent/instrumentation/jersey-2-appsec/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java

@@ -72,7 +72,8 @@ static void after(
         objToPass = ((Form) ret).asMap();
       } else {
         // Process XML strings for WAF compatibility
-        objToPass = XmlDomUtils.processXmlForWaf(ret);
+        Object processedObj = XmlDomUtils.processXmlForWaf(ret);
+        objToPass = processedObj != null ? processedObj : ret;
       }
 
       CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);

dd-java-agent/instrumentation/jersey-3-appsec/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java

@@ -72,7 +72,8 @@ static void after(
         objToPass = ((Form) ret).asMap();
       } else {
         // Process XML strings for WAF compatibility
-        objToPass = XmlDomUtils.processXmlForWaf(ret);
+        Object processedObj = XmlDomUtils.processXmlForWaf(ret);
+        objToPass = processedObj != null ? processedObj : ret;
       }
 
       CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);

dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ContextParseAdvice.java

@@ -35,7 +35,10 @@ static void after(
     }
 
     // Process XML strings for WAF compatibility
-    obj = XmlDomUtils.processXmlForWaf(obj);
+    Object processedObj = XmlDomUtils.processXmlForWaf(obj);
+    if (processedObj != null) {
+      obj = processedObj;
+    }
 
     CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);
     BiFunction<RequestContext, Object, Flow<Void>> callback =

dd-java-agent/instrumentation/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextJsonAdvice.java

@@ -32,7 +32,10 @@ static void after(
       obj = ((JsonObject) obj).getMap();
     } else {
       // Process XML strings for WAF compatibility
-      obj = XmlDomUtils.processXmlForWaf(obj);
+      Object processedObj = XmlDomUtils.processXmlForWaf(obj);
+      if (processedObj != null) {
+        obj = processedObj;
+      }
     }
 
     CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);

dd-java-agent/instrumentation/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextJsonAdvice.java

@@ -46,7 +46,10 @@ static void after(
       obj = ((JsonObject) obj).getMap();
     } else {
       // Process XML strings for WAF compatibility
-      obj = XmlDomUtils.processXmlForWaf(obj);
+      Object processedObj = XmlDomUtils.processXmlForWaf(obj);
+      if (processedObj != null) {
+        obj = processedObj;
+      }
     }
 
     CallbackProvider cbp = AgentTracer.get().getCallbackProvider(RequestContextSlot.APPSEC);

dd-java-agent/instrumentation/vertx-web-5.0/src/main/java/datadog/trace/instrumentation/vertx_5_0/server/WafPublishingBodyHandler.java

@@ -85,7 +85,7 @@ public String toString() {
       String s = delegate.toString();
       // Process XML strings for WAF compatibility
       Object processedBody = XmlDomUtils.processXmlForWaf(s);
-      publishRequestBody(processedBody);
+      publishRequestBody(processedBody != null ? processedBody : s);
       return s;
     }
 
@@ -94,7 +94,7 @@ public String toString(String enc) {
       String s = delegate.toString(enc);
       // Process XML strings for WAF compatibility
       Object processedBody = XmlDomUtils.processXmlForWaf(s);
-      publishRequestBody(processedBody);
+      publishRequestBody(processedBody != null ? processedBody : s);
       return s;
     }
 
@@ -103,7 +103,7 @@ public String toString(Charset enc) {
       String s = delegate.toString(enc);
       // Process XML strings for WAF compatibility
       Object processedBody = XmlDomUtils.processXmlForWaf(s);
-      publishRequestBody(processedBody);
+      publishRequestBody(processedBody != null ? processedBody : s);
       return s;
     }