axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r395137 - in /webservices/axis2/trunk/c/modules: core/phaseresolver/phase_resolver.c mod_addr/addr_in_handler.c mod_addr/addr_out_handler.c
Date Wed, 19 Apr 2006 05:27:19 GMT
Author: samisa
Date: Tue Apr 18 22:27:17 2006
New Revision: 395137

URL: http://svn.apache.org/viewcvs?rev=395137&view=rev
Log:
Fixed the problem of not being able to run non-addressing clients when addressing is enabled

Modified:
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=395137&r1=395136&r2=395137&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Tue Apr 18 22:27:17
2006
@@ -677,8 +677,11 @@
             
         metadata = (axis2_handler_desc_t *)
             AXIS2_ARRAY_LIST_GET(all_handlers, env, i);
-        status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder, 
-            env, metadata);
+        if (resolver_impl->phase_holder)
+        {
+            status = AXIS2_PHASE_HOLDER_ADD_HANDLER(resolver_impl->phase_holder, 
+                env, metadata);
+        }
     }
     
     /* Free the locally created all_handlers list */

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?rev=395137&r1=395136&r2=395137&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Tue Apr 18 22:27:17 2006
@@ -169,12 +169,8 @@
                 else 
                 {
                     /* addressing headers are not present in the SOAP message*/
-                    /*logger.debug(
-                            "No Addressing Headers present in the IN message. Addressing
In Handler does nothing.");
-                    */
-                    /** TODO : set the error */
-                    AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "No Addressing Headers
present in the IN message. Addressing In Handler cannot do anything.");
-                    return AXIS2_FAILURE;
+                    AXIS2_LOG_INFO((*env)->log, AXIS2_LOG_SI, "No Addressing Headers present
in the IN message. Addressing In Handler cannot do anything.");
+                    return AXIS2_SUCCESS; /* no addressing heades means addressing not in
use */
                 }
             }
             

Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?rev=395137&r1=395136&r2=395137&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Tue Apr 18 22:27:17 2006
@@ -141,7 +141,10 @@
 
     msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS (msg_ctx, env);
     if (!msg_info_headers)
-        return AXIS2_FAILURE;
+        return AXIS2_SUCCESS; /* no addressing in use */
+    if (!AXIS2_MSG_INFO_HEADERS_GET_ACTION (msg_info_headers, env))
+        return AXIS2_SUCCESS; /* If no action present, assume no addressing in use */
+
 
     ctx = AXIS2_MSG_CTX_GET_BASE (msg_ctx, env);
     property =



Mime
View raw message