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 sa...@apache.org on 2006/03/09 20:01:44 UTC

svn commit: r384583 - in /webservices/axis2/trunk/c/modules/core/transport/http: http_transport_utils.c http_worker.c receiver/http_svr_thread.c

Author: samisa
Date: Thu Mar  9 11:01:43 2006
New Revision: 384583

URL: http://svn.apache.org/viewcvs?rev=384583&view=rev
Log:
Fixed some problems in null pointer handlings

Modified:
    webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=384583&r1=384582&r2=384583&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Thu Mar  9 11:01:43 2006
@@ -253,7 +253,9 @@
 						AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI);
 			if(NULL == soap_builder)
 			{
-				AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);
+			    /* We should not be freeing om_builder here as it is done by
+                axis2_soap_builder_create in case of error - Samisa*/
+				/*AXIS2_OM_STAX_BUILDER_FREE(om_builder, env);*/
 				om_builder = NULL;
 				xml_reader = NULL;
 				return AXIS2_FAILURE;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=384583&r1=384582&r2=384583&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Thu Mar  9 11:01:43 2006
@@ -376,7 +376,8 @@
 		{
     		property = AXIS2_CTX_GET_PROPERTY(ctx, env, 
 						AXIS2_RESPONSE_WRITTEN, AXIS2_FALSE);
-            ctx_written = AXIS2_PROPERTY_GET_VALUE(property, env);
+            if (property)
+                ctx_written = AXIS2_PROPERTY_GET_VALUE(property, env);
 		}
 	}
 	if(NULL != ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)

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=384583&r1=384582&r2=384583&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 Thu Mar  9 11:01:43 2006
@@ -316,7 +316,8 @@
 	status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, &thread_env, svr_conn, 
 						request);
 	AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, &thread_env);
-    AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, &thread_env);
+    if (request)
+        AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, &thread_env);
 	AXIS2_FREE(thread_env->allocator, arg_list);
 	AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t2);
 	millisecs = t2.millitm - t1.millitm;