Merge #120

.github/workflows/git-broadcast.yml

@@ -0,0 +1,26 @@
+name: Broadcast master updates to satellites
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+concurrency:
+  group: git-broadcast
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2-beta
+      with:
+        node-version: '16'
+    - name: broadcast master changes to satellite branches
+      env:
+        RUN_NUMBER: ${{ github.run_number }}
+      run: |
+        git config --global user.name "Git Broadcast"
+        git config --global user.email "git-broadcast@no-reply.com"
+        npx git-broadcast@latest --from master --push --pretty --suppress-log-prefixes --prefix-logs-with $GITHUB_REPOSITORY

package.json

@@ -28,9 +28,9 @@
   "author": "",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/fluffynuts/logging-log4net/issues"
+    "url": "https://github.com/apache/logging-log4net/issues"
   },
-  "homepage": "https://github.com/fluffynuts/logging-log4net#readme",
+  "homepage": "https://github.com/apache/logging-log4net#readme",
   "devDependencies": {
     "cross-env": "^7.0.2",
     "gulp-debug": "^4.0.0",

src/log4net.Tests/Appender/RollingFileAppenderTest.cs

@@ -1997,6 +1997,16 @@ public void TestInitializeRollBackups4()
       VerifyInitializeRollBackups(8, iMaxRollBackups);
     }
 
+    /// <summary>
+    /// Ensures that no problems result from creating and then closing the appender
+    /// when it has not also been initialized with ActivateOptions().
+    /// </summary>
+    [Test]
+    public void TestCreateCloseNoActivateOptions()
+    {
+      var appender = new RollingFileAppender();
+      appender.Close();
+    }
     //
     // Helper functions to dig into the appender
     //

src/log4net.Tests/log4net.Tests.csproj

@@ -61,6 +61,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NExpect" Version="2.0.78" />
     <PackageReference Include="Quackers.TestLogger" Version="1.0.24" />

src/log4net.sln

@@ -48,6 +48,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{78CD
 		..\pom.xml = ..\pom.xml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{3EE6A25B-2DF9-4825-A784-EE32EEA0BE58}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{92B16708-35B8-4E60-AF44-CF6D797FB63B}"
+	ProjectSection(SolutionItems) = preProject
+		..\.github\workflows\git-broadcast.yml = ..\.github\workflows\git-broadcast.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -92,6 +99,7 @@ Global
 		{D818035F-0345-49EF-9AB9-021583986CE2} = {8953473C-EEE8-4740-993D-B8E10FA876CD}
 		{169118A6-CAC3-4E83-ABEE-9E884B75B294} = {8953473C-EEE8-4740-993D-B8E10FA876CD}
 		{A4F9E417-2250-4075-9118-B4FF1C58B6C5} = {8953473C-EEE8-4740-993D-B8E10FA876CD}
+		{92B16708-35B8-4E60-AF44-CF6D797FB63B} = {3EE6A25B-2DF9-4825-A784-EE32EEA0BE58}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {532DE291-8626-4FE3-B255-78515D744BCF}

src/log4net/Appender/FileAppender.cs

@@ -111,7 +111,7 @@ private LockStateException(SerializationInfo info, StreamingContext context) : b
       }
 
       private Stream m_realStream = null;
-      private LockingModelBase m_lockingModel = null;
+      private readonly LockingModelBase m_lockingModel;
       private int m_lockLevel = 0;
 
       public LockingStream(LockingModelBase locking)