You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/11/27 08:22:08 UTC
svn commit: r598539 - in /webservices/axis2/trunk/c/src/core:
clientapi/svc_client.c deployment/conf_init.c
transport/http/server/simple_axis2_server/http_server_main.c
Author: dinesh
Date: Mon Nov 26 23:22:03 2007
New Revision: 598539
URL: http://svn.apache.org/viewvc?rev=598539&view=rev
Log:
made the changes suggest in axis2c-783, Thanks Bill Mitchel !
Modified:
webservices/axis2/trunk/c/src/core/clientapi/svc_client.c
webservices/axis2/trunk/c/src/core/deployment/conf_init.c
webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c
Modified: webservices/axis2/trunk/c/src/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/clientapi/svc_client.c?rev=598539&r1=598538&r2=598539&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/src/core/clientapi/svc_client.c Mon Nov 26 23:22:03 2007
@@ -373,7 +373,6 @@
const axis2_options_t * override_options)
{
AXIS2_PARAM_CHECK (env->error, svc_client, AXIS2_FAILURE);
-
if (svc_client->override_options)
{
axis2_options_free(svc_client->override_options, env);
@@ -486,8 +485,9 @@
axis2_svc_client_t * svc_client,
const axutil_env_t * env)
{
- int i = 0,
- size = 0;
+ int i = 0;
+ int size = 0;
+
AXIS2_PARAM_CHECK (env->error, svc_client, AXIS2_FAILURE);
if (!svc_client->headers)
@@ -653,8 +653,6 @@
axis2_msg_ctx_t *res_msg_ctx = NULL;
axis2_msg_ctx_t *msg_ctx = NULL;
-
-
AXIS2_PARAM_CHECK (env->error, svc_client, AXIS2_FAILURE);
svc_client->last_response_soap_envelope = NULL;
@@ -1483,10 +1481,9 @@
const axutil_env_t * env,
axiom_node_t * root_node)
{
-
- AXIS2_PARAM_CHECK (env->error, svc_client, AXIS2_FAILURE);
neethi_policy_t *neethi_policy = NULL;
+ AXIS2_PARAM_CHECK (env->error, svc_client, AXIS2_FAILURE);
neethi_policy = neethi_util_create_policy_from_om(env, root_node);
if (neethi_policy)
Modified: webservices/axis2/trunk/c/src/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/conf_init.c?rev=598539&r1=598538&r2=598539&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/conf_init.c Mon Nov 26 23:22:03 2007
@@ -190,7 +190,8 @@
if (status == AXIS2_SUCCESS)
{
len = strlen (axis2_home);
- if (!strcmp ((axis2_home + (len - 9)), "axis2.xml"))
+ if ((len >= 9) &&
+ !strcmp ((axis2_home + (len - 9)), "axis2.xml"))
{
dep_engine = axis2_dep_engine_create_with_axis2_xml (env,
axis2_home);
Modified: webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c?rev=598539&r1=598538&r2=598539&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c Mon Nov 26 23:22:03 2007
@@ -189,7 +189,8 @@
if (status == AXIS2_SUCCESS)
{
len = strlen (repo_path);
- if (!strcmp ((repo_path + (len - 9)), "axis2.xml"))
+ if ((len >= 9) &&
+ !strcmp ((repo_path + (len - 9)), "axis2.xml"))
{
file_flag = 1;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org