logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1520870 - in /logging/log4net/branches/1.2.12: ./ src/Appender/ tests/src/ tests/src/Appender/
Date Sun, 08 Sep 2013 14:35:22 GMT
Author: bodewig
Date: Sun Sep  8 14:35:22 2013
New Revision: 1520870

URL: http://svn.apache.org/r1520870
Log:
merge fix for LOG4NET-390 from trunk

Added:
    logging/log4net/branches/1.2.12/tests/src/Appender/AppenderCollectionTest.cs
      - copied unchanged from r1520544, logging/log4net/trunk/tests/src/Appender/AppenderCollectionTest.cs
Modified:
    logging/log4net/branches/1.2.12/   (props changed)
    logging/log4net/branches/1.2.12/src/Appender/AppenderCollection.cs
    logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2003.csproj
    logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2008.csproj
    logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2010.csproj

Propchange: logging/log4net/branches/1.2.12/
------------------------------------------------------------------------------
  Merged /logging/log4net/trunk:r1520538-1520544

Modified: logging/log4net/branches/1.2.12/src/Appender/AppenderCollection.cs
URL: http://svn.apache.org/viewvc/logging/log4net/branches/1.2.12/src/Appender/AppenderCollection.cs?rev=1520870&r1=1520869&r2=1520870&view=diff
==============================================================================
--- logging/log4net/branches/1.2.12/src/Appender/AppenderCollection.cs (original)
+++ logging/log4net/branches/1.2.12/src/Appender/AppenderCollection.cs Sun Sep  8 14:35:22
2013
@@ -883,6 +883,16 @@ namespace log4net.Appender
 				throw new NotSupportedException("This is a Read Only Collection and can not be modified");
 			}
 
+			public override IAppender[] ToArray()
+			{
+				return m_collection.ToArray();
+			}
+
+			public override void TrimToSize()
+			{
+				throw new NotSupportedException("This is a Read Only Collection and can not be modified");
+			}
+
 			#endregion
 		}
 

Modified: logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2003.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2003.csproj?rev=1520870&r1=1520869&r2=1520870&view=diff
==============================================================================
--- logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2003.csproj (original)
+++ logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2003.csproj Sun Sep  8 14:35:22
2013
@@ -137,6 +137,11 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "Appender\AppenderCollectionTest.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
                     RelPath = "Appender\AdoNetAppenderTest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"

Modified: logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2008.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2008.csproj?rev=1520870&r1=1520869&r2=1520870&view=diff
==============================================================================
--- logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2008.csproj (original)
+++ logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2008.csproj Sun Sep  8 14:35:22
2013
@@ -123,6 +123,7 @@
     <Compile Include="Appender\AdoNet\Log4NetParameter.cs" />
     <Compile Include="Appender\AdoNet\Log4NetParameterCollection.cs" />
     <Compile Include="Appender\AdoNet\Log4NetTransaction.cs" />
+    <Compile Include="Appender\AppenderCollectionTest.cs" />
     <Compile Include="Appender\BufferingAppenderTest.cs">
       <SubType>Code</SubType>
     </Compile>

Modified: logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2010.csproj
URL: http://svn.apache.org/viewvc/logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2010.csproj?rev=1520870&r1=1520869&r2=1520870&view=diff
==============================================================================
--- logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2010.csproj (original)
+++ logging/log4net/branches/1.2.12/tests/src/log4net.Tests.vs2010.csproj Sun Sep  8 14:35:22
2013
@@ -140,6 +140,7 @@
     <Compile Include="Appender\AdoNet\Log4NetParameter.cs" />
     <Compile Include="Appender\AdoNet\Log4NetParameterCollection.cs" />
     <Compile Include="Appender\AdoNet\Log4NetTransaction.cs" />
+    <Compile Include="Appender\AppenderCollectionTest.cs" />
     <Compile Include="Appender\BufferingAppenderTest.cs">
       <SubType>Code</SubType>
     </Compile>



Mime
View raw message