axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r394612 - in /webservices/axis2/trunk/c/modules: core/receivers/raw_xml_in_out_msg_recv.c xml/soap/soap_envelope.c
Date Mon, 17 Apr 2006 05:53:58 GMT
Author: samisa
Date: Sun Apr 16 22:53:56 2006
New Revision: 394612

URL: http://svn.apache.org/viewcvs?rev=394612&view=rev
Log:
Added SOAP header to default fault envelope.
Also enabled the service impl to set the SOAP envelope in case of error

Modified:
    webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?rev=394612&r1=394611&r2=394612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Sun Apr 16
22:53:56 2006
@@ -236,6 +236,14 @@
         soap_ns = AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI; /* default is 1.2 */
         soap_version = AXIS2_SOAP11;
     }
+
+    if (AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(new_msg_ctx, env))
+    {
+        /* service implementation has set the envelope, 
+           useful when setting a SOAP fault.
+           No need to further process */
+        return AXIS2_SUCCESS;
+    }
     
     /* create the soap envelope here*/
     env_ns = axis2_om_namespace_create(env, soap_ns, "soapenv"); 

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c?rev=394612&r1=394611&r2=394612&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Sun Apr 16 22:53:56 2006
@@ -750,7 +750,7 @@
 		AXIS2_SOAP_DEFAULT_NAMESPACE_PREFIX);
 	if(!om_ns)
 		return NULL;
-	soap_env = axis2_soap_envelope_create(env, om_ns);
+	soap_env = axis2_soap_envelope_create_default_soap_envelope(env, soap_version);
 	if (!soap_env)
 	{
 		AXIS2_OM_NAMESPACE_FREE(om_ns, env);
@@ -758,9 +758,7 @@
 	}
 	env_impl = AXIS2_INTF_TO_IMPL(soap_env);
 
-	AXIS2_SOAP_ENVELOPE_SET_SOAP_VERSION(soap_env, env, soap_version);
-	soap_body   = axis2_soap_body_create_with_parent(env, soap_env);
-	env_impl->body = soap_body;
+    soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_env, env);
 	if (!soap_body)
 	{
 		AXIS2_SOAP_ENVELOPE_FREE(soap_env, env);



Mime
View raw message