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 sa...@apache.org on 2007/04/01 03:26:11 UTC
svn commit: r524503 - in /webservices/axis2/trunk/c: include/
modules/core/engine/ modules/mod_addr/ modules/mod_log/
Author: samisa
Date: Sat Mar 31 18:26:09 2007
New Revision: 524503
URL: http://svn.apache.org/viewvc?view=rev&rev=524503
Log:
Dropped ops from handler
Modified:
webservices/axis2/trunk/c/include/axis2_handler.h
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
webservices/axis2/trunk/c/modules/core/engine/handler.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
Modified: webservices/axis2/trunk/c/include/axis2_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler.h?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler.h Sat Mar 31 18:26:09 2007
@@ -48,105 +48,86 @@
/** Type name for struct axis2_handler */
typedef struct axis2_handler axis2_handler_t;
- /** Type name for struct axis2_handler_ops */
- typedef struct axis2_handler_ops axis2_handler_ops_t;
struct axis2_handler_desc;
struct axis2_msg_ctx;
/**
- * handler ops struct.
- * Encapsulator struct for ops of axis2_handler.
+ * Free handler struct.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_handler_ops
- {
- /**
- * Free handler struct.
- * @param handler pointer to handler
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- void (AXIS2_CALL *
- free)(
- axis2_handler_t *handler,
- const axutil_env_t *env);
-
-
- /**
- * Initializes the handler with the information form handler description.
- * @param handler pointer to handler
- * @param env pointer to environment struct
- * @param handler_desc pointer to handler description related to the handler
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- init)(
- axis2_handler_t *handler,
- const axutil_env_t *env,
- struct axis2_handler_desc *handler_desc);
-
- /**
- * Invoke is called to do the actual work assigned to the handler.
- * The phase that owns the handler is responsible for calling invoke
- * on top of the handler. Those structs that implement the interface
- * of the handler should implement the logic for invoke and assign the
- * respective function pointer to invoke operation of the ops struct.
- * @param handler pointer to handler
- * @param env pointer to environment struct
- * @param msg_ctx pointer to message context
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- invoke)(
- axis2_handler_t *handler,
- const axutil_env_t *env,
- struct axis2_msg_ctx *msg_ctx);
-
- /**
- * Gets QName.
- * @param handler pointer to handler
- * @param env pointer to environment struct
- * @return pointer to QName of the handler
- */
- const axutil_string_t *(AXIS2_CALL *
- get_name)(
- const axis2_handler_t *handler,
- const axutil_env_t *env);
-
- /**
- * Gets the named parameter.
- * @param handler pointer to handler
- * @param env pointer to environment struct
- * @param name name of the parameter to be accessed
- */
- axutil_param_t *(AXIS2_CALL *
- get_param)(
- const axis2_handler_t *handler,
- const axutil_env_t *env,
- const axis2_char_t *name);
-
- /**
- * Gets the handler description related to the handler.
- * @param handler pointer to handler
- * @param env pointer to environment struct
- * @return pointer to handler description struct related to handler
- */
- struct axis2_handler_desc *(AXIS2_CALL *
- get_handler_desc)(
- const axis2_handler_t *handler,
- const axutil_env_t *env);
-
- };
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_handler_free(axis2_handler_t *handler,
+ const axutil_env_t *env);
+
+
+ /**
+ * Initializes the handler with the information form handler description.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @param handler_desc pointer to handler description related to the handler
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_handler_init(axis2_handler_t *handler,
+ const axutil_env_t *env,
+ struct axis2_handler_desc *handler_desc);
+
+ /**
+ * Invoke is called to do the actual work assigned to the handler.
+ * The phase that owns the handler is responsible for calling invoke
+ * on top of the handler. Those structs that implement the interface
+ * of the handler should implement the logic for invoke and assign the
+ * respective function pointer to invoke operation of the ops struct.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @param msg_ctx pointer to message context
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_handler_invoke(axis2_handler_t *handler,
+ const axutil_env_t *env,
+ struct axis2_msg_ctx *msg_ctx);
+
+ /**
+ * Gets QName.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @return pointer to QName of the handler
+ */
+ AXIS2_EXTERN const axutil_string_t *AXIS2_CALL
+ axis2_handler_get_name(const axis2_handler_t *handler,
+ const axutil_env_t *env);
/**
- * handler struct.
+ * Gets the named parameter.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @param name name of the parameter to be accessed
*/
- struct axis2_handler
- {
- /** Operations of handler */
- axis2_handler_ops_t *ops;
- };
+ AXIS2_EXTERN axutil_param_t *AXIS2_CALL
+ axis2_handler_get_param(const axis2_handler_t *handler,
+ const axutil_env_t *env,
+ const axis2_char_t *name);
+
+ /**
+ * Gets the handler description related to the handler.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @return pointer to handler description struct related to handler
+ */
+ AXIS2_EXTERN struct axis2_handler_desc *AXIS2_CALL
+ axis2_handler_get_handler_desc(const axis2_handler_t *handler,
+ const axutil_env_t *env);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_handler_set_invoke(axis2_handler_t *handler,
+ const axutil_env_t *env,
+ void *func);
+
/**
* Function pointer defining the creates syntax for a handler struct instance.
@@ -155,8 +136,7 @@
* @return pointer to newly created handler struct
*/
typedef axis2_handler_t *(AXIS2_CALL *
- AXIS2_HANDLER_CREATE_FUNC)(
- const axutil_env_t *env,
+ AXIS2_HANDLER_CREATE_FUNC)(const axutil_env_t *env,
const axutil_string_t *name);
/**
@@ -165,8 +145,7 @@
* @return pointer to newly created handler struct
*/
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
- axis2_handler_create(
- const axutil_env_t *env);
+ axis2_handler_create(const axutil_env_t *env);
/**
* Creates a handler with invoke method implemented to fill in the service
@@ -176,39 +155,38 @@
* @return pointer to newly created handler struct
*/
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
- axis2_ctx_handler_create(
- const axutil_env_t *env,
+ axis2_ctx_handler_create(const axutil_env_t *env,
const axutil_string_t *qname);
/** Frees handler.
@sa axis2_handler_ops#free */
#define AXIS2_HANDLER_FREE(handler, env) \
- ((handler)->ops->free(handler, env))
+ axis2_handler_free(handler, env)
/** Initializes handler.
@sa axis2_handler_ops#init */
#define AXIS2_HANDLER_INIT(handler, env, handler_desc) \
- ((handler)->ops->init(handler, env, handler_desc))
+ axis2_handler_init(handler, env, handler_desc)
/** Invokes the handler.
@sa axis2_handler_ops#invoke */
#define AXIS2_HANDLER_INVOKE(handler, env, msg_ctx) \
- ((handler)->ops->invoke(handler, env, msg_ctx))
+ axis2_handler_invoke(handler, env, msg_ctx)
/** Gets handler QName.
@sa axis2_handler_ops#get_name */
#define AXIS2_HANDLER_GET_NAME(handler, env) \
- ((handler)->ops->get_name(handler, env))
+ axis2_handler_get_name(handler, env)
/** Gets the named parameter.
@sa axis2_handler_ops#get_param */
#define AXIS2_HANDLER_GET_PARAM(handler, env, name) \
- ((handler)->ops->get_param(handler, env, name))
+ axis2_handler_get_param(handler, env, name)
/** Gets handler description related to the handler.
@sa axis2_handler_ops#get_handler_desc */
#define AXIS2_HANDLER_GET_HANDLER_DESC(handler, env) \
- ((handler)->ops->get_handler_desc(handler, env))
+ axis2_handler_get_handler_desc(handler, env)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Sat Mar 31 18:26:09 2007
@@ -77,7 +77,7 @@
return NULL;
}
- handler->ops->invoke = axis2_addr_disp_invoke;
+ axis2_handler_set_invoke(handler, env, axis2_addr_disp_invoke);
axutil_string_free(name, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/ctx_handler.c Sat Mar 31 18:26:09 2007
@@ -84,8 +84,7 @@
AXIS2_HANDLER_INIT(handler, env, handler_desc);
/* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = axis2_ctx_handler_invoke;
+ axis2_handler_set_invoke(handler, env, axis2_ctx_handler_invoke);
return handler;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Sat Mar 31 18:26:09 2007
@@ -38,6 +38,13 @@
axutil_string_t *name;
};
+axis2_status_t AXIS2_CALL
+axis2_disp_checker_invoke(
+ axis2_handler_t *handler,
+ const axutil_env_t *env,
+ axis2_msg_ctx_t *msg_ctx);
+
+
axis2_disp_checker_t *AXIS2_CALL
axis2_disp_checker_create(
const axutil_env_t *env)
@@ -73,6 +80,8 @@
axis2_disp_checker_free(disp_checker, env);
return NULL;
}
+ axis2_handler_set_invoke(disp_checker->base, env, axis2_disp_checker_invoke);
+
/* handler desc of base handler */
handler_desc = axis2_handler_desc_create(env, disp_checker->name);
Modified: webservices/axis2/trunk/c/modules/core/engine/handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/handler.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/handler.c Sat Mar 31 18:26:09 2007
@@ -18,146 +18,80 @@
#include <axis2_handler.h>
#include <axis2_handler_desc.h>
-typedef struct axis2_handler_impl
+struct axis2_handler
{
- /** handler struct */
- axis2_handler_t handler;
/** handler description. This is a reference, hence a shallow copy. */
axis2_handler_desc_t *handler_desc;
-}
-axis2_handler_impl_t;
-
-/** Interface to implementation conversion macro */
-#define AXIS2_INTF_TO_IMPL(handler) ((axis2_handler_impl_t *)handler)
-
-
-void AXIS2_CALL
-axis2_handler_free(
- axis2_handler_t *handler,
- const axutil_env_t *env);
-
-const axutil_string_t *AXIS2_CALL
-axis2_handler_get_name(
- const axis2_handler_t *handler,
- const axutil_env_t *env) ;
-
-axis2_status_t AXIS2_CALL
-axis2_handler_invoke(
- axis2_handler_t *handler,
- const axutil_env_t *env,
- struct axis2_msg_ctx *msg_ctx);
+ /**
+ * Invoke is called to do the actual work assigned to the handler.
+ * The phase that owns the handler is responsible for calling invoke
+ * on top of the handler. Those structs that implement the interface
+ * of the handler should implement the logic for invoke and assign the
+ * respective function pointer to invoke operation.
+ * @param handler pointer to handler
+ * @param env pointer to environment struct
+ * @param msg_ctx pointer to message context
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ axis2_status_t (AXIS2_CALL *
+ invoke)(axis2_handler_t *handler,
+ const axutil_env_t *env,
+ struct axis2_msg_ctx *msg_ctx);
+};
-axutil_param_t *AXIS2_CALL
-axis2_handler_get_param(
- const axis2_handler_t *handler,
- const axutil_env_t *env,
- const axis2_char_t *name);
-
-axis2_status_t AXIS2_CALL
-axis2_handler_init(
- axis2_handler_t *handler,
- const axutil_env_t *env,
- axis2_handler_desc_t *handler_desc);
-
-axis2_handler_desc_t *AXIS2_CALL
-axis2_handler_get_handler_desc(
- const axis2_handler_t *handler,
- const axutil_env_t *env);
-
-axis2_handler_t *AXIS2_CALL
+AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
axis2_handler_create(
const axutil_env_t *env)
{
- axis2_handler_impl_t *handler_impl = NULL;
+ axis2_handler_t *handler = NULL;
AXIS2_ENV_CHECK(env, NULL);
- handler_impl = AXIS2_MALLOC(env->allocator, sizeof(axis2_handler_impl_t));
- if (!handler_impl)
+ handler = AXIS2_MALLOC(env->allocator, sizeof(axis2_handler_t));
+ if (!handler)
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return NULL;
}
- handler_impl->handler_desc = NULL;
+ handler->handler_desc = NULL;
- /* initialize ops */
- handler_impl->handler.ops = NULL;
- handler_impl->handler.ops = AXIS2_MALLOC(env->allocator, sizeof(axis2_handler_ops_t));
- if (!handler_impl->handler.ops)
- {
- AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
- AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
- axis2_handler_free(&(handler_impl->handler), env);
- return NULL;
- }
-
- handler_impl->handler.ops->free =
- axis2_handler_free;
-
- handler_impl->handler.ops->init =
- axis2_handler_init;
-
- handler_impl->handler.ops->invoke =
- axis2_handler_invoke;
-
- handler_impl->handler.ops->get_name =
- axis2_handler_get_name;
-
- handler_impl->handler.ops->get_param =
- axis2_handler_get_param;
-
- handler_impl->handler.ops->get_handler_desc =
- axis2_handler_get_handler_desc;
-
- return &(handler_impl->handler);
+ return handler;
}
-void AXIS2_CALL
+AXIS2_EXTERN void AXIS2_CALL
axis2_handler_free(
axis2_handler_t *handler,
const axutil_env_t *env)
{
- axis2_handler_impl_t *handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- handler_impl = AXIS2_INTF_TO_IMPL(handler);
- if (handler_impl->handler.ops)
- {
- AXIS2_FREE(env->allocator, handler_impl->handler.ops);
- handler_impl->handler.ops = NULL;
- }
-
- AXIS2_FREE(env->allocator, handler_impl);
- handler_impl = NULL;
-
+ AXIS2_FREE(env->allocator, handler);
return;
}
-const axutil_string_t *AXIS2_CALL
+AXIS2_EXTERN const axutil_string_t *AXIS2_CALL
axis2_handler_get_name(
const axis2_handler_t *handler,
const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- if (!(AXIS2_INTF_TO_IMPL(handler)->handler_desc))
+ if (!(handler->handler_desc))
return NULL;
- return axis2_handler_desc_get_name(AXIS2_INTF_TO_IMPL(handler)->handler_desc, env);
+ return axis2_handler_desc_get_name(handler->handler_desc, env);
}
-axis2_status_t AXIS2_CALL
-axis2_handler_invoke(
- axis2_handler_t *handler,
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_handler_invoke(axis2_handler_t *handler,
const axutil_env_t *env,
struct axis2_msg_ctx *msg_ctx)
{
- /** NOTE invoke has to be implemented by an implementing handler */
- return AXIS2_SUCCESS;
+ return handler->invoke(handler, env, msg_ctx);
}
-axutil_param_t *AXIS2_CALL
+AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_handler_get_param(
const axis2_handler_t *handler,
const axutil_env_t *env,
@@ -165,30 +99,39 @@
{
AXIS2_ENV_CHECK(env, NULL);
- if (!(AXIS2_INTF_TO_IMPL(handler)->handler_desc))
+ if (!(handler->handler_desc))
return NULL;
- return axis2_handler_desc_get_param(AXIS2_INTF_TO_IMPL(handler)->handler_desc, env, name);
+ return axis2_handler_desc_get_param(handler->handler_desc, env, name);
}
-axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_init(
axis2_handler_t *handler,
const axutil_env_t *env,
axis2_handler_desc_t *handler_desc)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(handler)->handler_desc = handler_desc;
+ handler->handler_desc = handler_desc;
axis2_handler_desc_set_handler(handler_desc, env, handler);
return AXIS2_SUCCESS;
}
-axis2_handler_desc_t *AXIS2_CALL
+AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
axis2_handler_get_handler_desc(
const axis2_handler_t *handler,
const axutil_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(handler)->handler_desc;
+ return handler->handler_desc;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_handler_set_invoke(
+ axis2_handler_t *handler,
+ const axutil_env_t *env,
+ void *func)
+{
+ handler->invoke = func;
+ return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Sat Mar 31 18:26:09 2007
@@ -73,7 +73,7 @@
return NULL;
}
- handler->ops->invoke = axis2_req_uri_disp_invoke;
+ axis2_handler_set_invoke(handler, env, axis2_req_uri_disp_invoke);
axutil_string_free(name, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c Sat Mar 31 18:26:09 2007
@@ -73,7 +73,7 @@
return NULL;
}
- handler->ops->invoke = axiom_soap_action_disp_invoke;
+ axis2_handler_set_invoke(handler, env, axiom_soap_action_disp_invoke);
axutil_string_free(name, env);
Modified: webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c Sat Mar 31 18:26:09 2007
@@ -76,7 +76,7 @@
return NULL;
}
- handler->ops->invoke = axiom_soap_body_disp_invoke;
+ axis2_handler_set_invoke(handler, env, axiom_soap_body_disp_invoke);
axutil_string_free(name, env);
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Sat Mar 31 18:26:09 2007
@@ -106,9 +106,7 @@
/* handler init is handled by conf loading, so no need to do it here */
- /* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = axis2_addr_in_handler_invoke;
+ axis2_handler_set_invoke(handler, env, axis2_addr_in_handler_invoke);
return handler;
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Sat Mar 31 18:26:09 2007
@@ -98,11 +98,7 @@
return NULL;
}
- /* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = axis2_addr_out_handler_invoke;
-
- /*axutil_qname_free(handler_qname, env);*/
+ axis2_handler_set_invoke(handler, env, axis2_addr_out_handler_invoke);
return handler;
}
Modified: webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_in_handler.c Sat Mar 31 18:26:09 2007
@@ -52,9 +52,7 @@
/* handler init is handled by conf loading, so no need to do it here */
- /* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = axutil_log_in_handler_invoke;
+ axis2_handler_set_invoke(handler, env, axutil_log_in_handler_invoke);
return handler;
}
Modified: webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c?view=diff&rev=524503&r1=524502&r2=524503
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_log/log_out_handler.c Sat Mar 31 18:26:09 2007
@@ -52,9 +52,7 @@
/* handler init is handled by conf loading, so no need to do it here */
- /* set the base struct's invoke op */
- if (handler->ops)
- handler->ops->invoke = axutil_log_out_handler_invoke;
+ axis2_handler_set_invoke(handler, env, axutil_log_out_handler_invoke);
return handler;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org