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/25 06:29:05 UTC

svn commit: r532189 - in /webservices/axis2/trunk/c: include/axis2_http_worker.h src/core/transport/http/receiver/http_receiver.c src/core/transport/http/receiver/http_svr_thread.c

Author: samisa
Date: Tue Apr 24 21:29:04 2007
New Revision: 532189

URL: http://svn.apache.org/viewvc?view=rev&rev=532189
Log:
Dropped macros

Modified:
    webservices/axis2/trunk/c/include/axis2_http_worker.h
    webservices/axis2/trunk/c/src/core/transport/http/receiver/http_receiver.c
    webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c

Modified: webservices/axis2/trunk/c/include/axis2_http_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_worker.h?view=diff&rev=532189&r1=532188&r2=532189
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_worker.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_worker.h Tue Apr 24 21:29:04 2007
@@ -86,18 +86,16 @@
     axis2_http_worker_create (const axutil_env_t *env,
         axis2_conf_ctx_t *conf_ctx);
 
-/** Process the request. */
-#define AXIS2_HTTP_WORKER_PROCESS_REQUEST(http_worker, env, svr_conn,\
+/*#define AXIS2_HTTP_WORKER_PROCESS_REQUEST(http_worker, env, svr_conn,\
             simple_request) axis2_http_worker_process_request(\
             http_worker, env, svr_conn, simple_request)
 
-/** Sets the server port.  */
 #define AXIS2_HTTP_WORKER_SET_SVR_PORT(http_worker, env, port) \
                 axis2_http_worker_set_svr_port(http_worker, env, port)
 
-/** Frees the http worker. */
 #define AXIS2_HTTP_WORKER_FREE(http_worker, env) \
                 axis2_http_worker_free(http_worker, env)
+*/
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/src/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/receiver/http_receiver.c?view=diff&rev=532189&r1=532188&r2=532189
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/receiver/http_receiver.c Tue Apr 24 21:29:04 2007
@@ -216,7 +216,7 @@
         return AXIS2_FAILURE;
     }
     worker = axis2_http_worker_create(env, server_impl->conf_ctx);
-    AXIS2_HTTP_WORKER_SET_SVR_PORT(worker, env, server_impl->port);
+    axis2_http_worker_set_svr_port(worker, env, server_impl->port);
     if (! worker)
     {
         axis2_http_svr_thread_free(server_impl->svr_thread, env);

Modified: webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c?view=diff&rev=532189&r1=532188&r2=532189
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c Tue Apr 24 21:29:04 2007
@@ -97,7 +97,7 @@
 
     if (svr_thread->worker)
     {
-        AXIS2_HTTP_WORKER_FREE(svr_thread->worker, env);
+        axis2_http_worker_free(svr_thread->worker, env);
         svr_thread->worker = NULL;
     }
     if (-1 != svr_thread->listen_socket)
@@ -254,7 +254,7 @@
             axis2_http_socket_read_timeout);
     request = axis2_simple_http_svr_conn_read_request(svr_conn, thread_env);
     tmp = arg_list->worker;
-    status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, thread_env, svr_conn,
+    status = axis2_http_worker_process_request(tmp, thread_env, svr_conn,
             request);
     axis2_simple_http_svr_conn_free(svr_conn, thread_env);
     if (request)
@@ -297,7 +297,7 @@
         thread_env = NULL;
     }
 #ifdef AXIS2_SVR_MULTI_THREADED
-    /*axutil_thread_pool_exit_thread(env->thread_pool, thd);*/
+    axutil_thread_pool_exit_thread(env->thread_pool, thd);
 #endif
 
     return NULL;



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