svn commit: r958738 - in /axis/axis2/c/core/trunk/util: include/axutil_env.h src/env.c

[damitha]

Author: damitha
Date: Mon Jun 28 21:06:36 2010
New Revision: 958738

URL: http://svn.apache.org/viewvc?rev=958738&view=rev
Log:
Applied patch AXIS2C-1460

Modified:
    axis/axis2/c/core/trunk/util/include/axutil_env.h
    axis/axis2/c/core/trunk/util/src/env.c

Modified: axis/axis2/c/core/trunk/util/include/axutil_env.h
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/include/axutil_env.h?rev=958738&r1=958737&r2=958738&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/include/axutil_env.h (original)
+++ axis/axis2/c/core/trunk/util/include/axutil_env.h Mon Jun 28 21:06:36 2010
@@ -69,7 +69,7 @@ extern "C"
         axutil_log_t *log;
 
         /** This flag indicate whether logging is enabled or not */
-        axis2_bool_t log_enabled;
+        /* axis2_bool_t log_enabled; */ /* Deprecated use instead log->enabled 
*/
 
         /** Thread pool routines */
         axutil_thread_pool_t *thread_pool;

Modified: axis/axis2/c/core/trunk/util/src/env.c
URL: 
http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/src/env.c?rev=958738&r1=958737&r2=958738&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/src/env.c (original)
+++ axis/axis2/c/core/trunk/util/src/env.c Mon Jun 28 21:06:36 2010
@@ -42,7 +42,7 @@ axutil_env_create(
 
     env->log = axutil_log_create_default(allocator);
     env->log->level = AXIS2_LOG_LEVEL_DEBUG; /* default log level is debug */
-    env->log_enabled = AXIS2_TRUE;
+    env->log->enabled = AXIS2_TRUE;
 
     /* Create default error struct */
     env->error = axutil_error_create(allocator);
@@ -84,11 +84,6 @@ axutil_env_create_with_error_log(
     env->error = error;
     env->log = log;
 
-    if(env->log)
-        env->log_enabled = AXIS2_TRUE;
-    else
-        env->log_enabled = AXIS2_FALSE;
-
     axutil_error_init();
 
     env->ref = 1;
@@ -130,11 +125,6 @@ axutil_env_create_with_error_log_thread_
 
     env->thread_pool = pool;
 
-    if(env->log)
-        env->log_enabled = AXIS2_TRUE;
-    else
-        env->log_enabled = AXIS2_FALSE;
-
     axutil_error_init();
 
     env->ref = 1;
@@ -207,9 +197,9 @@ axutil_env_enable_log(
     axutil_env_t *env,
     axis2_bool_t enable)
 {
-    if(env)
+    if(env && env->log)
     {
-        env->log_enabled = enable;
+        env->log->enabled = enable;
         return AXIS2_SUCCESS;
     }