You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/11/22 06:22:02 UTC
svn commit: r597302 - in /webservices/axis2/trunk/c/src/core:
clientapi/stub.c deployment/dep_engine.c
Author: dinesh
Date: Wed Nov 21 21:21:59 2007
New Revision: 597302
URL: http://svn.apache.org/viewvc?rev=597302&view=rev
Log:
report an error when axis2.xml is not found
Modified:
webservices/axis2/trunk/c/src/core/clientapi/stub.c
webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
Modified: webservices/axis2/trunk/c/src/core/clientapi/stub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/clientapi/stub.c?rev=597302&r1=597301&r2=597302&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/clientapi/stub.c (original)
+++ webservices/axis2/trunk/c/src/core/clientapi/stub.c Wed Nov 21 21:21:59 2007
@@ -148,6 +148,7 @@
return AXIS2_SUCCESS;
}
+
axis2_status_t AXIS2_CALL
axis2_stub_set_endpoint_uri(
axis2_stub_t * stub,
@@ -211,6 +212,8 @@
const axis2_svc_ctx_t *svc_ctx = NULL;
const axis2_char_t *svc_ctx_id = NULL;
+ AXIS2_PARAM_CHECK (env->error, stub, AXIS2_FAILURE);
+
svc_ctx = axis2_svc_client_get_svc_ctx(stub->svc_client, env);
svc_ctx_id = axis2_svc_ctx_get_svc_id(svc_ctx, env);
return svc_ctx_id;
@@ -221,6 +224,7 @@
const axis2_stub_t * stub,
const axutil_env_t * env)
{
+ AXIS2_PARAM_CHECK (env->error, stub, AXIS2_FAILURE);
return stub->svc_client;
}
Modified: webservices/axis2/trunk/c/src/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/deployment/dep_engine.c?rev=597302&r1=597301&r2=597302&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/src/core/deployment/dep_engine.c Wed Nov 21 21:21:59 2007
@@ -829,6 +829,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+
if (client_home && 0 != axutil_strcmp("", client_home))
{
status =
@@ -837,6 +838,13 @@
{
is_repos_exist = AXIS2_TRUE;
}
+ else
+ {
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
+ "axis2.xml is not available in client repo %s ", client_home);
+ AXIS2_ERROR_SET (env->error, AXIS2_ERROR_CONFIG_NOT_FOUND, AXIS2_FAILURE);
+ return NULL;
+ }
}
else
{
@@ -844,7 +852,7 @@
axutil_strdup(env, AXIS2_CONFIGURATION_RESOURCE);
if (!dep_engine->conf_name)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_REPO_CAN_NOT_BE_NULL, AXIS2_FAILURE);
return NULL;
}
}
@@ -949,6 +957,7 @@
path_l = axutil_stracat(env, client_home, AXIS2_PATH_SEP_STR);
dep_engine->conf_name = axutil_stracat(env, path_l, AXIS2_SERVER_XML_FILE);
AXIS2_FREE(env->allocator, path_l);
+
if (!dep_engine->conf_name)
{
dep_engine->conf_name =
@@ -959,6 +968,7 @@
AXIS2_FAILURE) return AXIS2_FAILURE;
}
}
+
status = axutil_file_handler_access(dep_engine->conf_name, AXIS2_F_OK);
if (AXIS2_SUCCESS != status)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org