[FeatureSwitchService] Replace lazy initialization with static

Rodrigo Moya · Rodrigo Moya · commit dc2678b52132 · 2019-11-13T19:59:28.000+01:00
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.FeatureConfiguration/FeatureSwitchService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.FeatureConfiguration/FeatureSwitchService.cs
@@ -36,14 +36,9 @@ namespace MonoDevelop.Core.FeatureConfiguration
 	public static class FeatureSwitchService
 	{
 		static Dictionary<string, FeatureSwitch> featureSwitches = new Dictionary<string, FeatureSwitch> ();
-		static bool initialized = false;
 
-		static void EnsureInitialized ()
+		static FeatureSwitchService ()
 		{
-			if (initialized)
-				return;
-
-			initialized = true;
 			AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Core/FeatureSwitches", HandleFeatureSwitchExtension);
 		}
 
@@ -61,8 +56,6 @@ static void HandleFeatureSwitchExtension (object sender, ExtensionNodeEventArgs
 
 		public static bool? IsFeatureEnabled (string featureName)
 		{
-			EnsureInitialized ();
-
 			if (string.IsNullOrEmpty (featureName)) {
 				return null;
 			}
@@ -119,7 +112,6 @@ internal static void SetFeatureSwitchValue (string id, bool? value)
 
 		internal static IEnumerable<FeatureSwitch> DescribeFeatures ()
 		{
-			EnsureInitialized ();
 			return featureSwitches.Values;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,9 @@ namespace MonoDevelop.Core.FeatureConfiguration`
`36`	`36`	`public static class FeatureSwitchService`
`37`	`37`	`{`
`38`	`38`	`static Dictionary<string, FeatureSwitch> featureSwitches = new Dictionary<string, FeatureSwitch> ();`
`39`		`- static bool initialized = false;`
`40`	`39`
`41`		`- static void EnsureInitialized ()`
	`40`	`+ static FeatureSwitchService ()`
`42`	`41`	`{`
`43`		`- if (initialized)`
`44`		`- return;`
`45`		`-`
`46`		`- initialized = true;`
`47`	`42`	`AddinManager.AddExtensionNodeHandler ("/MonoDevelop/Core/FeatureSwitches", HandleFeatureSwitchExtension);`
`48`	`43`	`}`
`49`	`44`
`@@ -61,8 +56,6 @@ static void HandleFeatureSwitchExtension (object sender, ExtensionNodeEventArgs`
`61`	`56`
`62`	`57`	`public static bool? IsFeatureEnabled (string featureName)`
`63`	`58`	`{`
`64`		`- EnsureInitialized ();`
`65`		`-`
`66`	`59`	`if (string.IsNullOrEmpty (featureName)) {`
`67`	`60`	`return null;`
`68`	`61`	`}`
`@@ -119,7 +112,6 @@ internal static void SetFeatureSwitchValue (string id, bool? value)`
`119`	`112`
`120`	`113`	`internal static IEnumerable<FeatureSwitch> DescribeFeatures ()`
`121`	`114`	`{`
`122`		`- EnsureInitialized ();`
`123`	`115`	`return featureSwitches.Values;`
`124`	`116`	`}`
`125`	`117`