Use a static initializer instead.

Explicit static constructors prevent beforefieldinit.
NetTopologySuite · Sep 15, 2021 · 307a331 · 307a331
1 parent 72e1a4c
commit 307a331
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/NetTopologySuite/IO/WKTReader.cs b/src/NetTopologySuite/IO/WKTReader.cs
@@ -44,7 +44,7 @@ public class WKTReader
 
         private static readonly CoordinateSequenceFactory CoordinateSequenceFactoryXYZM = CoordinateArraySequenceFactory.Instance;
 
-        private static readonly StreamTokenizerSettings tokenizerSettings;
+        private static readonly StreamTokenizerSettings TokenizerSettings = CreateDefaultStreamTokenizerSettings();
 
         private NtsGeometryServices _ntsGeometryServices;
 
@@ -58,9 +58,9 @@ public class WKTReader
          */
         private bool _isStrict = true;
 
-        static WKTReader()
+        private static StreamTokenizerSettings CreateDefaultStreamTokenizerSettings()
         {
-            tokenizerSettings = new StreamTokenizerSettings();
+            var tokenizerSettings = new StreamTokenizerSettings();
             tokenizerSettings.SetDefaults();
             // set tokenizer to NOT parse numbers
             tokenizerSettings.ResetCharTypeTable();
@@ -73,6 +73,7 @@ static WKTReader()
             tokenizerSettings.WordChars('.', '.');
             tokenizerSettings.WhitespaceChars(0, ' ');
             tokenizerSettings.CommentChar('#');
+            return tokenizerSettings;
         }
 
         /// <summary>
@@ -222,7 +223,7 @@ public Geometry Read(TextReader reader)
 
         internal TokenStream Tokenizer(TextReader reader)
         {
-            var tokenizer = new StreamTokenizer(reader, tokenizerSettings);
+            var tokenizer = new StreamTokenizer(reader, TokenizerSettings);
             return new TokenStream(tokenizer.GetEnumerator());
         }