axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kausha...@apache.org
Subject svn commit: r511457 - /webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
Date Sun, 25 Feb 2007 06:22:26 GMT
Author: kaushalye
Date: Sat Feb 24 22:22:25 2007
New Revision: 511457

URL: http://svn.apache.org/viewvc?view=rev&rev=511457
Log:
Applying patch sent for JIRA AXIS2C-529


Modified:
    webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c?view=diff&rev=511457&r1=511456&r2=511457
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c Sat
Feb 24 22:22:25 2007
@@ -225,6 +225,7 @@
     int output_stream_size = 0;
     axis2_bool_t doing_mtom = AXIS2_FALSE;
     axis2_property_t *dump_property = NULL;
+    axis2_property_t *ssl_pp_property = NULL;
     axis2_param_t *ssl_pp_param = NULL; /* ssl passphrase */
     axis2_char_t *ssl_pp = NULL;
 
@@ -480,14 +481,23 @@
     
     /* TODO: Load from property
      * ssl_pp_property = AXIS2_MSG_CTX_GET_PROPERTY(AXIS2_SSL_PASSPHRASE);*/
-
-    ssl_pp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
-
-    if (ssl_pp_param)
+    
+    ssl_pp_property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env, 
+            AXIS2_SSL_PASSPHRASE, AXIS2_FALSE);
+    if (ssl_pp_property)
     {
-        ssl_pp = AXIS2_PARAM_GET_VALUE(ssl_pp_param, env);
+        ssl_pp = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE(
+                ssl_pp_property, env);
     }
+    else
+    {
+        ssl_pp_param = AXIS2_MSG_CTX_GET_PARAMETER(msg_ctx, env, AXIS2_SSL_PASSPHRASE);
 
+        if (ssl_pp_param)
+        {
+            ssl_pp = AXIS2_PARAM_GET_VALUE(ssl_pp_param, env);
+        }
+    }
     status_code = AXIS2_HTTP_CLIENT_SEND(sender_impl->client, env, request, ssl_pp);
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message