. (#339)

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.30</VersionPrefix>
+    <VersionPrefix>1.0.31</VersionPrefix>
   </PropertyGroup>
 
   <Choose>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid --version 1.0.30.0
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid --version 1.0.31.0

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.ObjectModel;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Util;
 #if !USE_ASPNETCORE
 using Owin;
 #else
@@ -26,7 +26,7 @@ namespace WireMock.Owin
 
         ConcurrentDictionary<string, ScenarioState> Scenarios { get; }
 
-        ObservableCollection<LogEntry> LogEntries { get; }
+        ConcurrentObservableCollection<LogEntry> LogEntries { get; }
 
         int? RequestLogExpirationDuration { get; set; }
 

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -162,7 +162,8 @@ namespace WireMock.Owin
 
             if (_options.MaxRequestLogCount != null)
             {
-                foreach (var logEntry in _options.LogEntries.OrderBy(le => le.RequestMessage.DateTime).Take(_options.LogEntries.Count - _options.MaxRequestLogCount.Value).ToList())
+                var logEntries = _options.LogEntries.ToList();
+                foreach (var logEntry in logEntries.OrderBy(le => le.RequestMessage.DateTime).Take(logEntries.Count - _options.MaxRequestLogCount.Value))
                 {
                     _options.LogEntries.Remove(logEntry);
                 }
@@ -172,7 +173,7 @@ namespace WireMock.Owin
             {
                 var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
 
-                foreach (var logEntry in _options.LogEntries.Where(le => le.RequestMessage.DateTime < checkTime).ToList())
+                foreach (var logEntry in _options.LogEntries.ToList().Where(le => le.RequestMessage.DateTime < checkTime))
                 {
                     _options.LogEntries.Remove(logEntry);
                 }

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -27,7 +27,7 @@ namespace WireMock.Owin
 
         public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new ConcurrentDictionary<string, ScenarioState>();
 
-        public ObservableCollection<LogEntry> LogEntries { get; } = new ConcurrentObservableCollection<LogEntry>();
+        public ConcurrentObservableCollection<LogEntry> LogEntries { get; } = new ConcurrentObservableCollection<LogEntry>();
 
         public int? RequestLogExpirationDuration { get; set; }
 

src/WireMock.Net/Server/FluentMockServer.LogEntries.cs

@@ -3,11 +3,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Linq;
 using JetBrains.Annotations;
 using WireMock.Logging;
-using WireMock.Matchers.Request;
-using System.Linq;
 using WireMock.Matchers;
+using WireMock.Matchers.Request;
 
 namespace WireMock.Server
 {
@@ -27,7 +27,7 @@ namespace WireMock.Server
         /// Gets the request logs.
         /// </summary>
         [PublicAPI]
-        public IEnumerable<LogEntry> LogEntries => new ReadOnlyCollection<LogEntry>(_options.LogEntries.ToArray());
+        public IEnumerable<LogEntry> LogEntries => new ReadOnlyCollection<LogEntry>(_options.LogEntries.ToList());
 
         /// <summary>
         /// The search log-entries based on matchers.
@@ -73,7 +73,7 @@ namespace WireMock.Server
         public bool DeleteLogEntry(Guid guid)
         {
             // Check a logentry exists with the same GUID, if so, remove it.
-            var existing = _options.LogEntries.FirstOrDefault(m => m.Guid == guid);
+            var existing = _options.LogEntries.ToList().FirstOrDefault(m => m.Guid == guid);
             if (existing != null)
             {
                 _options.LogEntries.Remove(existing);

src/WireMock.Net/Util/ConcurrentObservableCollection.cs

@@ -1,14 +1,15 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace WireMock.Util
 {
     /// <summary>
-    /// A special Collection that overrides methods of <see cref="ObservableCollection{T}"/> to make them thread safe
+    /// A special Collection that overrides methods of <see cref="ObservableCollection{T}"/> to make them thread safe.
     /// </summary>
     /// <typeparam name="T">The type of elements in the collection.</typeparam>
     /// <inheritdoc cref="ObservableCollection{T}" />
-    public class ConcurrentObservableCollection<T> : ObservableCollection<T>
+    internal class ConcurrentObservableCollection<T> : ObservableCollection<T>
     {
         private readonly object _lockObject = new object();
 
@@ -73,5 +74,13 @@ namespace WireMock.Util
                 base.MoveItem(oldIndex, newIndex);
             }
         }
+
+        public List<T> ToList()
+        {
+            lock (_lockObject)
+            {
+                return Items.ToList();
+            }
+        }
     }
 }