You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by bo...@apache.org on 2015/08/23 18:14:14 UTC
svn commit: r1697211 - in /logging/log4net/branches/log4net-1.2.x/src: ./
Util/ReaderWriterLock.cs
Author: bodewig
Date: Sun Aug 23 16:14:13 2015
New Revision: 1697211
URL: http://svn.apache.org/r1697211
Log:
merge fix for LOG4NET-443 from trunk
Modified:
logging/log4net/branches/log4net-1.2.x/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/src/Util/ReaderWriterLock.cs
Propchange: logging/log4net/branches/log4net-1.2.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 23 16:14:13 2015
@@ -1,4 +1,4 @@
/logging/log4net/branches/1.2.12/src:1511686-1520870
/logging/log4net/tags/1.2.13RC1/src:1539445-1539920
/logging/log4net/trunk/src:1539083
-/logging/log4net/trunk/src/log4net:1541408,1544744,1665915,1669884-1669885,1669887-1669888,1669935,1669954,1669998
+/logging/log4net/trunk/src/log4net:1541408,1544744,1665915,1669884-1669885,1669887-1669888,1669935,1669954,1669998,1670018
Modified: logging/log4net/branches/log4net-1.2.x/src/Util/ReaderWriterLock.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Util/ReaderWriterLock.cs?rev=1697211&r1=1697210&r2=1697211&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Util/ReaderWriterLock.cs (original)
+++ logging/log4net/branches/log4net-1.2.x/src/Util/ReaderWriterLock.cs Sun Aug 23 16:14:13 2015
@@ -88,7 +88,12 @@ namespace log4net.Util
{
#if HAS_READERWRITERLOCK
#if HAS_READERWRITERLOCKSLIM
+ // prevent ThreadAbort while updating state, see https://issues.apache.org/jira/browse/LOG4NET-443
+ try { }
+ finally
+ {
m_lock.EnterReadLock();
+ }
#else
m_lock.AcquireReaderLock(-1);
#endif
@@ -132,7 +137,12 @@ namespace log4net.Util
{
#if HAS_READERWRITERLOCK
#if HAS_READERWRITERLOCKSLIM
+ // prevent ThreadAbort while updating state, see https://issues.apache.org/jira/browse/LOG4NET-443
+ try { }
+ finally
+ {
m_lock.EnterWriteLock();
+ }
#else
m_lock.AcquireWriterLock(-1);
#endif