TARGET_J2EE ifdef reorder for readability

svn path=/trunk/mcs/; revision=47656

diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index 97e510d03a644e9b783d4fdf9b5736a9eaef6959..92916f80e6709917f418b7b5693885cb3afbe3bb 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,6 @@
+2005-07-25  Eyal Alalouf  <eyala@mainsoft.com>
+       * WebConfigurationSettings.cs: TARGET_J2EE ifdef reorder for readability.
+
 2005-07-25 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * MachineKeyConfigHandler.cs: removed unused code. Use

diff --git a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
index 5b90a04b53660d297506d94f01999a0fe353d46e..8e48867a83587336a4fbe84c0d6364a70038e358 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
@@ -46,10 +46,7 @@ namespace System.Web.Configuration
 {
        class WebConfigurationSettings
        {
-#if !TARGET_J2EE
-               static IConfigurationSystem oldConfig;
-               static WebDefaultConfig config;
-#else
+#if TARGET_J2EE
                static private IConfigurationSystem oldConfig {
                        get {
                                return (IConfigurationSystem)AppDomain.CurrentDomain.GetData("WebConfigurationSettings.oldConfig");
@@ -67,6 +64,9 @@ namespace System.Web.Configuration
                                AppDomain.CurrentDomain.SetData("WebConfigurationSettings.config", value);
                        }
                }
+#else
+               static IConfigurationSystem oldConfig;
+               static WebDefaultConfig config;
 #endif
                static string machineConfigPath;
                const BindingFlags privStatic = BindingFlags.NonPublic | BindingFlags.Static;
@@ -141,9 +141,7 @@ namespace System.Web.Configuration
        //
        class WebDefaultConfig : IConfigurationSystem
        {
-#if !TARGET_J2EE
-               static WebDefaultConfig instance;
-#else
+#if TARGET_J2EE
                static private WebDefaultConfig instance {
                        get {
                                WebDefaultConfig val = (WebDefaultConfig)AppDomain.CurrentDomain.GetData("WebDefaultConfig.instance");
@@ -157,6 +155,8 @@ namespace System.Web.Configuration
                                AppDomain.CurrentDomain.SetData("WebDefaultConfig.instance", value);
                        }
                }
+#else
+               static WebDefaultConfig instance;
 #endif
                Hashtable fileToConfig;
                HttpContext firstContext;