From c9fbe7b0b60e606fc2ec43b32af1618fdedf53fc Mon Sep 17 00:00:00 2001
From: Nethmi Ranasinghe <nethmisudeni@gmail.com>
Date: Mon, 31 Mar 2025 11:56:48 +0530
Subject: [PATCH] Fix XML Schema validation not working for Soap APIs

---
 .../wso2/carbon/apimgt/gateway/utils/GatewayUtils.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/utils/GatewayUtils.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/utils/GatewayUtils.java
index bb13b420e0d6..416b690c774c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/utils/GatewayUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/utils/GatewayUtils.java
@@ -471,7 +471,13 @@ public static Map<String, InputStream> cloneRequestMessage(org.apache.synapse.Me
             bufferedInputStream = new BufferedInputStream(pipe.getInputStream());
         }
         inputStreamMap = new HashMap<>();
-        String contentType = axis2MC.getProperty(ThreatProtectorConstants.CONTENT_TYPE).toString();
+        String contentType;
+        Object contentTypeObject = axis2MC.getProperty(ThreatProtectorConstants.CONTENT_TYPE);
+        if (contentTypeObject != null) {
+            contentType = contentTypeObject.toString();
+        } else {
+            contentType = axis2MC.getProperty(ThreatProtectorConstants.SOAP_CONTENT_TYPE).toString();
+        }
 
         if (bufferedInputStream != null) {
             bufferedInputStream.mark(0);