axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r393881 - /webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
Date Thu, 13 Apr 2006 18:30:40 GMT
Author: samisa
Date: Thu Apr 13 11:30:33 2006
New Revision: 393881

URL: http://svn.apache.org/viewcvs?rev=393881&view=rev
Log:
Fixed the problem of using SOAP 1.2 as the SOAP version, despite setting the SOAP version.
Now the prepare soap envelope method would take SOAP version set into account when creating
the 
SOAP envelope
AXIS2C-123

Modified:
    webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c

Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?rev=393881&r1=393880&r2=393881&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Thu Apr 13 11:30:33 2006
@@ -85,7 +85,7 @@
         mep_client_impl->svc_ctx = svc_ctx;
     }
     
-    mep_client_impl->soap_version_uri = AXIS2_STRDUP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
env);
+    mep_client_impl->soap_version_uri = AXIS2_STRDUP(AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,
env);
     if (!(mep_client_impl->soap_version_uri))
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -200,6 +200,7 @@
     axis2_mep_client_impl_t *mep_client_impl = NULL;
     axis2_msg_ctx_t *msg_ctx = NULL;
     axis2_soap_envelope_t *envelope = NULL;
+    int soap_version = AXIS2_SOAP12;
     
     AXIS2_ENV_CHECK(env, NULL);
     
@@ -216,8 +217,17 @@
     {
         return NULL;
     }
-    
-    envelope = axis2_soap_envelope_create_default_soap_envelope(env, AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx,
env)?AXIS2_SOAP11:AXIS2_SOAP12);
+
+    if (mep_client_impl->soap_version_uri)
+    {
+        if (AXIS2_STRCMP(mep_client_impl->soap_version_uri, 
+                AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
+            soap_version = AXIS2_SOAP11;
+        else
+            soap_version = AXIS2_SOAP12;
+    }
+            
+    envelope = axis2_soap_envelope_create_default_soap_envelope(env, soap_version);
     if (!envelope)
     {
         return NULL;



Mime
View raw message