Author: rjung
Date: Sat Sep 25 14:34:25 2010
New Revision: 1001219

URL: http://svn.apache.org/viewvc?rev=1001219&view=rev
Log:
Don't destroy errno during trace logging.

Modified:
    tomcat/jk/trunk/native/common/jk_logger.h
    tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/jk/trunk/native/common/jk_logger.h
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_logger.h?rev=1001219&r1=1001218&r2=1001219&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_logger.h (original)
+++ tomcat/jk/trunk/native/common/jk_logger.h Sat Sep 25 14:34:25 2010
@@ -109,13 +109,17 @@ struct jk_file_logger_t
 #define JK_TRACE_ENTER(l)                               \
     do {                                                \
         if ((l) && (l)->level == JK_LOG_TRACE_LEVEL) {  \
+            int tmp_errno = errno;                      \
             jk_log((l), JK_LOG_TRACE, "enter");         \
+            errno = tmp_errno;                          \
     } } while (0)
 
 #define JK_TRACE_EXIT(l)                                \
     do {                                                \
         if ((l) && (l)->level == JK_LOG_TRACE_LEVEL) {  \
+            int tmp_errno = errno;                      \
             jk_log((l), JK_LOG_TRACE, "exit");          \
+            errno = tmp_errno;                          \
     } } while (0)
 
 #endif  /* JK_PRODUCTION */

Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1001219&r1=1001218&r2=1001219&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sat Sep 25 14:34:25 2010
@@ -56,6 +56,9 @@
         section allowing other threads to use the connection
         pool during maintenance. (mturk)
       </update>
+      <fix>
+        Common: Don't destroy errno during trace logging. (rjung)
+      </fix>
       <update>
         Apache: Added version number resource for mod_jk.so on Windows. (timw)
       </update>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to