Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fast fix for NullRefException from FileAppender #120

Merged
merged 1 commit into from
Mar 9, 2024
Merged

Fast fix for NullRefException from FileAppender #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/log4net.Tests/Appender/RollingFileAppenderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,6 +2013,17 @@ 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();
}

/// <summary>
///
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions src/log4net.Tests/log4net.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,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="1.0.273" />
<PackageReference Include="Quackers.TestLogger" Version="1.0.24" />
Expand Down
4 changes: 2 additions & 2 deletions src/log4net/Appender/FileAppender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,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)
Expand Down Expand Up @@ -1306,7 +1306,7 @@ protected override void Reset()
protected override void OnClose()
{
base.OnClose();
m_lockingModel.OnClose();
m_lockingModel?.OnClose();
}

/// <summary>
Expand Down