Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion MFilesAPI.Extensions/DisposableBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace MFilesAPI.Extensions
{
/// <summary>
/// A base class for objects implemtning the <see cref="IDisposable"/> pattern.
/// A base class for objects implementing the <see cref="IDisposable"/> pattern.
/// Override <see cref="DisposeManagedObjects"/> and/or <see cref="DisposeUnmanagedObjects"/> as appropriate.
/// <remarks>see: https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-dispose?redirectedfrom=MSDN#implementing-the-dispose-pattern-for-a-base-class </remarks>
/// </summary>
Expand Down
6 changes: 3 additions & 3 deletions MFilesAPI.Extensions/Email/EmailMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,14 @@ public override void AddHeader(string name, string value)
this.mailMessage.Headers.Add(name, value);
}

protected override void Dispose(bool disposing)
{
protected override void DisposeManagedObjects()
{
// Attempt to dispose the mail message.
this.mailMessage?.Dispose();
this.mailMessage = null;

// Call the base implementation.
base.Dispose(disposing);
base.DisposeManagedObjects();
}

#endregion
Expand Down
39 changes: 1 addition & 38 deletions MFilesAPI.Extensions/Email/EmailMessageBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace MFilesAPI.Extensions.Email
/// A base implementation of <see cref="IEmailMessage"/> that plugins can extend.
/// </summary>
public abstract class EmailMessageBase
: IEmailMessage
: DisposableBase, IEmailMessage
{
private SmtpConfiguration configuration = null;

Expand Down Expand Up @@ -182,42 +182,5 @@ public void AddAllFiles(

#endregion

#region IDisposable

/// <summary>
/// Disposes of any managed or unmanaged resources.
/// </summary>
/// <param name="disposing">If true, <see cref="IDisposable.Dispose"/> has been called. False if called from within a finalizer.</param>
/// <remarks>
/// Unmanaged resources should be disposed of regardless of <paramref name="disposing" />.
/// Managed resources should be disposed of if <paramref name="disposing"/> is <see langword="true"/>.
/// More information on this pattern is available onlne: https://docs.microsoft.com/en-us/dotnet/standard/garbage-collection/implementing-dispose
/// </remarks>
protected virtual void Dispose(bool disposing)
{
}

/// <inheritdoc />
/// <remarks>Calls <see cref="Dispose(bool)"/>, with disposing set to <see langword="true"/>.</remarks>
public void Dispose()
{
// Dispose of unmanaged resources.
this.Dispose(true);

// Suppress finalization.
GC.SuppressFinalize(this);
}

/// <summary>
/// Ensures that any resources are correctly disposed of during finalization.
/// </summary>
/// <remarks>Calls <see cref="Dispose(bool)"/>, with disposing set to <see langword="false"/>.</remarks>
~EmailMessageBase()
{
this.Dispose(false);
}

#endregion

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ public TemporaryFileDownload DownloadFile
}

/// <inheritdoc />
protected override void Dispose(bool disposing)
protected override void DisposeManagedObjects()
{
// If we should clean on disposal then clean.
if (this.CleanDirectoryOnDisposal)
this.CleanTemporaryFiles();

base.Dispose(disposing);
base.DisposeManagedObjects();
}

}
Expand Down