axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r371871 - in /webservices/axis2/trunk/c/modules/core: engine/ receivers/ transport/http/receiver/ transport/http/server/
Date Tue, 24 Jan 2006 09:14:24 GMT
Author: samisa
Date: Tue Jan 24 01:14:11 2006
New Revision: 371871

URL: http://svn.apache.org/viewcvs?rev=371871&view=rev
Log:
More tidying up to get the output clean and simple.


Modified:
    webservices/axis2/trunk/c/modules/core/engine/engine.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c

Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=371871&r1=371870&r2=371871&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Jan 24 01:14:11 2006
@@ -100,7 +100,7 @@
     engine_impl->engine.ops->get_receiver_fault_code = axis2_engine_get_receiver_fault_code;
     engine_impl->engine.ops->free = axis2_engine_free;
 
-    AXIS2_LOG(env, "Axis2 Engine Started\n", AXIS2_LOG_INFO);
+    AXIS2_LOG(env, "Axis2 Engine Started", AXIS2_LOG_INFO);
     
     return &(engine_impl->engine);
 }
@@ -210,10 +210,22 @@
     if (!(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env)))
     {
         /* write the message to the wire */
+        axis2_transport_sender_t *transport_sender = NULL;
         axis2_transport_out_desc_t *transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx,
env);
-        axis2_transport_sender_t *transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out,
env);
-        /*TODO:Uncomment this once the implementation done*/
-        /*AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);*/
+        
+        if (transport_out)
+        {
+            transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
+            if (transport_sender)
+                AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
+        }
+        else
+        {
+            axis2_char_t message[1024];
+            sprintf(message, "%s:%d - Transport out is not set in message context", __FILE__,
__LINE__); 
+            AXIS2_LOG(env, message, AXIS2_LOG_DEBUG);
+            return AXIS2_FAILURE;
+        }
     }
     
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?rev=371871&r1=371870&r2=371871&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Tue Jan 24 01:14:11 2006
@@ -98,10 +98,9 @@
         if (address)
         {
             axis2_char_t **url_tokens = NULL;
-            
-            AXIS2_LOG(env, "Checking for Service using target endpoint address :", AXIS2_LOG_INFO);
-            AXIS2_LOG(env, address, AXIS2_LOG_INFO);
-            AXIS2_LOG(env, "\n", AXIS2_LOG_INFO);
+            axis2_char_t message[1024];
+            sprintf(message, "Checking for Service using target endpoint address : %s", address);
+            AXIS2_LOG(env, message, AXIS2_LOG_INFO);
             
             url_tokens = axis2_parse_request_url_for_svc_and_op(env, address);
             
@@ -166,9 +165,9 @@
                 {
                     axis2_qname_t *op_qname = NULL;
                     axis2_op_t *op = NULL;
-                    AXIS2_LOG(env, "Checking for Operation using target endpoint uri fragment
: ", AXIS2_LOG_INFO);
-                    AXIS2_LOG(env, url_tokens[1], AXIS2_LOG_INFO);
-                    AXIS2_LOG(env, "\n", AXIS2_LOG_INFO);
+                    axis2_char_t message[1024];
+                    sprintf(message, "Checking for Service using target endpoint uri fragment
: %s", url_tokens[1]);
+                    AXIS2_LOG(env, message, AXIS2_LOG_INFO);
                     op_qname = axis2_qname_create(env, url_tokens[1], NULL, NULL);
                     op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, AXIS2_QNAME_GET_LOCALPART(op_qname,
env));
                     AXIS2_QNAME_FREE(op_qname, env);

Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?rev=371871&r1=371870&r2=371871&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Tue Jan 24
01:14:11 2006
@@ -90,6 +90,14 @@
     op_desc = AXIS2_OP_CTX_GET_OP(op_ctx, env);
     
     svc_obj = AXIS2_MSG_RECV_GET_IMPL_OBJ(msg_recv, env, msg_ctx);
+    
+    if (!svc_obj)
+    {
+        axis2_char_t message[1024];
+        sprintf(message, "%s:%d - Impl object for service not set in message receiver", __FILE__,
__LINE__);
+        AXIS2_LOG(env, message, AXIS2_LOG_DEBUG);
+        return AXIS2_FAILURE;
+    }
     /* find the WebService method */
     /*Object obj = getTheImplementationObject(msgContext);
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?rev=371871&r1=371870&r2=371871&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Tue Jan 24
01:14:11 2006
@@ -185,7 +185,7 @@
 		AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
 		return AXIS2_FAILURE;
 	}
-	AXIS2_LOG_WRITE((*env)->log, "[Axis2]Starting HTTP server thread\n", 
+	AXIS2_LOG_WRITE((*env)->log, "[Axis2]Starting HTTP server thread", 
 						AXIS2_LOG_INFO);
 	AXIS2_HTTP_SVR_THREAD_SET_WORKER(server_impl->svr_thread, env, worker);
 	AXIS2_HTTP_SVR_THREAD_RUN(server_impl->svr_thread, env);
@@ -198,7 +198,7 @@
 {
     AXIS2_FUNC_PARAM_CHECK(server, env, AXIS2_FAILURE);
 	
-	AXIS2_LOG_WRITE((*env)->log, "[Axis2]Terminating HTTP server thread\n", 
+	AXIS2_LOG_WRITE((*env)->log, "[Axis2]Terminating HTTP server thread", 
 						AXIS2_LOG_INFO);
 	if(NULL != AXIS2_INTF_TO_IMPL(server)->svr_thread)
 	{
@@ -206,7 +206,7 @@
 						env);
 	}
 	AXIS2_LOG_WRITE((*env)->log, "[Axis2]Successfully terminated  HTTP server\
-						thread\n", AXIS2_LOG_INFO);
+						thread", AXIS2_LOG_INFO);
 	return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=371871&r1=371870&r2=371871&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Tue Jan
24 01:14:11 2006
@@ -182,7 +182,7 @@
 			secs--;
 		}
 		secs += millisecs/1000.0;
-		sprintf(log_str, "[Axis2]Request served in %.3f seconds\n", secs);
+		sprintf(log_str, "[Axis2]Request served in %.3f seconds", secs);
 		AXIS2_LOG_WRITE((*env)->log, log_str, 
 						AXIS2_LOG_INFO);
 	}

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c?rev=371871&r1=371870&r2=371871&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/http_server_main.c Tue Jan
24 01:14:11 2006
@@ -80,17 +80,17 @@
 	printf("[Axis2]Starting Axis2 HTTP server....\n");
 	AXIS2_LOG_WRITE(env->log, "[Axis2]Starting Axis2 HTTP server....\n", 
 						AXIS2_LOG_INFO);
-	sprintf(tmp_str, "[Axis2]Server port : %d\n", port);
+	sprintf(tmp_str, "[Axis2]Server port : %d", port);
 	printf(tmp_str);
 	AXIS2_LOG_WRITE(env->log, tmp_str, AXIS2_LOG_INFO);
-	sprintf(tmp_str, "[Axis2]Repo location : %s\n", repo);
+	sprintf(tmp_str, "[Axis2]Repo location : %s", repo);
 	printf(tmp_str);
 	AXIS2_LOG_WRITE(env->log, tmp_str, AXIS2_LOG_INFO);
 	
 	server = axis2_http_server_create(&env, repo, port);
 	if(NULL == server)
 	{
-		sprintf(tmp_str, "[Axis2]Server creation failed: Error code: %d\n", 
+		sprintf(tmp_str, "[Axis2]Server creation failed: Error code: %d", 
 						env->error->error_number);
 		printf(tmp_str);
         printf("%s \n", AXIS2_ERROR_GET_MESSAGE(env->error));



Mime
View raw message