Merge pull request #2 from ServiceStack/master

rsafier · rsafier · commit f9e7238af2ef · 2016-01-24T20:06:14.000-05:00
ensured JsWriter instance is Initialized after JsConfig
diff --git a/src/ServiceStack.Text/QueryStringSerializer.cs b/src/ServiceStack.Text/QueryStringSerializer.cs
@@ -28,7 +28,13 @@ namespace ServiceStack
 {
 	public static class QueryStringSerializer
 	{
-		internal static readonly JsWriter<JsvTypeSerializer> Instance = new JsWriter<JsvTypeSerializer>();
+        static QueryStringSerializer()
+        {
+            JsConfig.InitStatics();
+            Instance = new JsWriter<JsvTypeSerializer>();
+        }
+
+	    internal static readonly JsWriter<JsvTypeSerializer> Instance;
 
 		private static Dictionary<Type, WriteObjectDelegate> WriteFnCache = new Dictionary<Type, WriteObjectDelegate>();
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,13 @@ namespace ServiceStack`
`28`	`28`	`{`
`29`	`29`	`public static class QueryStringSerializer`
`30`	`30`	`{`
`31`		`- internal static readonly JsWriter<JsvTypeSerializer> Instance = new JsWriter<JsvTypeSerializer>();`
	`31`	`+ static QueryStringSerializer()`
	`32`	`+ {`
	`33`	`+ JsConfig.InitStatics();`
	`34`	`+ Instance = new JsWriter<JsvTypeSerializer>();`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ internal static readonly JsWriter<JsvTypeSerializer> Instance;`
`32`	`38`
`33`	`39`	`private static Dictionary<Type, WriteObjectDelegate> WriteFnCache = new Dictionary<Type, WriteObjectDelegate>();`
`34`	`40`