axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject svn commit: r719164 - in /webservices/axis2/trunk/c: ides/vc/axis2c/services/echo/echo.vcproj util/src/hash.c
Date Thu, 20 Nov 2008 05:27:16 GMT
Author: shankar
Date: Wed Nov 19 21:27:15 2008
New Revision: 719164

URL: http://svn.apache.org/viewvc?rev=719164&view=rev
Log:
(1)adding neethi include files to axis2c echo service.
(2)memory leak fix in hash map

Modified:
    webservices/axis2/trunk/c/ides/vc/axis2c/services/echo/echo.vcproj
    webservices/axis2/trunk/c/util/src/hash.c

Modified: webservices/axis2/trunk/c/ides/vc/axis2c/services/echo/echo.vcproj
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/ides/vc/axis2c/services/echo/echo.vcproj?rev=719164&r1=719163&r2=719164&view=diff
==============================================================================
--- webservices/axis2/trunk/c/ides/vc/axis2c/services/echo/echo.vcproj (original)
+++ webservices/axis2/trunk/c/ides/vc/axis2c/services/echo/echo.vcproj Wed Nov 19 21:27:15
2008
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\..\..\..\include;.\..\..\..\..\..\util\include;.\..\..\..\..\..\axiom\include;"
+				AdditionalIncludeDirectories=".\..\..\..\..\..\include;.\..\..\..\..\..\util\include;.\..\..\..\..\..\neethi\include;.\..\..\..\..\..\axiom\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ECHO_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -175,19 +175,19 @@
 	<References>
 		<ProjectReference
 			ReferencedProjectIdentifier="{9524B8C5-79D9-4470-9A47-8BD163ABBB15}"
-			RelativePathToProject=".\axis2_engine\axis2_engine.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_engine\axis2_engine.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{7C816A64-FA96-4C6C-8DB0-5256441F54BC}"
-			RelativePathToProject=".\axiom\axiom.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axiom\axiom.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{3887B3E3-1A45-40E5-BC95-9C51000C86DB}"
-			RelativePathToProject=".\axutil\axutil.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axutil\axutil.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{D7D7FBA1-5E43-4586-8F69-D4ED2628D2D8}"
-			RelativePathToProject=".\axis2_parser\axis2_parser.vcproj"
+			RelativePathToProject="..\Axis2C\ides\vc\axis2c\axis2_parser\axis2_parser.vcproj"
 		/>
 	</References>
 	<Files>

Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?rev=719164&r1=719163&r2=719164&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Wed Nov 19 21:27:15 2008
@@ -665,7 +665,18 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     if (ht)
     {
+        if (ht->env)
+        {
+            /*since we now keep a ref count in env and incrementing it
+             *inside hash_make we need to free the env.Depending on the
+              situation the env struct is freed or ref count will be 
+              decremented.*/
+
+            axutil_free_thread_env((axutil_env_t*)(ht->env));
+            ht->env = NULL;
+        }
         ht->env = env;
+        axutil_env_increment_ref((axutil_env_t*)env);
     }
 }
 



Mime
View raw message