From 90514188c05bfc5548181b08f807d69eac171071 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Tue, 5 Dec 2017 14:25:15 +1300
Subject: [PATCH] -Test

---
 Src/Newtonsoft.Json.Tests/Issues/Issue1404.cs | 56 +++++++++++++++++++
 .../Utilities/ThreadSafeStore.cs              |  2 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 Src/Newtonsoft.Json.Tests/Issues/Issue1404.cs

diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue1404.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue1404.cs
new file mode 100644
index 00000000..89888aaf
--- /dev/null
+++ b/Src/Newtonsoft.Json.Tests/Issues/Issue1404.cs
@@ -0,0 +1,56 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+#if NETSTANDARD2_0
+using System;
+using System.Data;
+using System.IO;
+using System.Linq;
+using Newtonsoft.Json.Serialization;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue1404 : TestFixtureBase
+    {
+        [Test]
+        public void Test()
+        {
+            DefaultContractResolver resolver = new DefaultContractResolver();
+
+            JsonContract contract = resolver.ResolveContract(typeof(DirectoryInfo));
+
+            Assert.AreEqual(JsonContractType.Object, contract.ContractType);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json/Utilities/ThreadSafeStore.cs b/Src/Newtonsoft.Json/Utilities/ThreadSafeStore.cs
index 1f011081..2e135f0a 100644
--- a/Src/Newtonsoft.Json/Utilities/ThreadSafeStore.cs
+++ b/Src/Newtonsoft.Json/Utilities/ThreadSafeStore.cs
@@ -39,7 +39,7 @@ namespace Newtonsoft.Json.Utilities
     internal class ThreadSafeStore<TKey, TValue>
     {
 #if HAVE_CONCURRENT_DICTIONARY
-        private ConcurrentDictionary<TKey, TValue> _concurrentStore;
+        private readonly ConcurrentDictionary<TKey, TValue> _concurrentStore;
 #else
         private readonly object _lock = new object();
         private Dictionary<TKey, TValue> _store;