From bbc7149726c6208a071e35722a33860d04245ea3 Mon Sep 17 00:00:00 2001 From: Konstantin Triger Date: Sun, 6 Jan 2008 14:49:19 +0000 Subject: [PATCH] the AppSettings collection's Add should behave as Set svn path=/trunk/mcs/; revision=92342 --- .../AppSettings.jvm.cs | 78 +++++++++++++++++++ .../WebConfigurationManager.cs | 17 +--- mcs/class/System.Web/System.Web20.csproj | 3 +- 3 files changed, 81 insertions(+), 17 deletions(-) create mode 100644 mcs/class/System.Web/System.Web.Configuration_2.0/AppSettings.jvm.cs diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AppSettings.jvm.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AppSettings.jvm.cs new file mode 100644 index 00000000000..da1a81e9ec9 --- /dev/null +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/AppSettings.jvm.cs @@ -0,0 +1,78 @@ +// +// System.Web.Configuration.AppSettings.jvm.cs +// +// Authors: +// Konstantin Triger +// +// 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. +// +// Copyright (C) 2008 Mainsoft corp. (http://www.mainsoft.com) +// + +using System; +using System.Collections.Generic; +using System.Text; +using System.Collections.Specialized; +using javax.servlet; + +namespace System.Web.Configuration +{ + sealed class KeyValueMergedCollection : NameValueCollection + { + readonly NameValueCollection _wrapped; + public KeyValueMergedCollection (HttpContext hc, NameValueCollection wrapped) + : base (wrapped) { + _wrapped = wrapped; + + IServiceProvider provider = (IServiceProvider) ((IServiceProvider) hc).GetService (typeof (HttpWorkerRequest)); + ServletConfig config = (ServletConfig) provider.GetService (typeof (ServletConfig)); + ServletContext context = config.getServletContext (); + + for (java.util.Enumeration e = context.getInitParameterNames (); e.hasMoreElements (); ) { + string key = (string) e.nextElement (); + Set (key, context.getInitParameter (key)); + } + + for (java.util.Enumeration e = config.getInitParameterNames (); e.hasMoreElements (); ) { + string key = (string) e.nextElement (); + Set (key, config.getInitParameter (key)); + } + } + + public override void Add (string name, string val) { + Set (name, val); + } + + public override void Remove (string name) { + _wrapped.Remove (name); + base.Remove (name); + } + + public override void Clear () { + _wrapped.Clear (); + base.Clear (); + } + + public override void Set (string name, string value) { + _wrapped.Set (name, value); + base.Set (name, value); + } + } +} diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs index b4e21790ff8..40471615bf2 100644 --- a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs +++ b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationManager.cs @@ -279,22 +279,7 @@ namespace System.Web.Configuration { NameValueCollection collection = (NameValueCollection) hc.Items [AppSettingsKey]; if (collection == null) { - IServiceProvider provider = (IServiceProvider) ((IServiceProvider) hc).GetService (typeof (HttpWorkerRequest)); - javax.servlet.ServletConfig config = (javax.servlet.ServletConfig) provider.GetService (typeof (javax.servlet.ServletConfig)); - javax.servlet.ServletContext context = config.getServletContext (); - - collection = new NameValueCollection ((NameValueCollection)value); - - for (java.util.Enumeration e = context.getInitParameterNames (); e.hasMoreElements (); ) { - string key = (string) e.nextElement (); - collection.Add (key, context.getInitParameter (key)); - } - - for (java.util.Enumeration e = config.getInitParameterNames (); e.hasMoreElements (); ) { - string key = (string) e.nextElement (); - collection.Add (key, config.getInitParameter (key)); - } - + collection = new KeyValueMergedCollection (hc, (NameValueCollection) value); hc.Items [AppSettingsKey] = collection; } diff --git a/mcs/class/System.Web/System.Web20.csproj b/mcs/class/System.Web/System.Web20.csproj index 14aa39978be..29b9167e8a4 100644 --- a/mcs/class/System.Web/System.Web20.csproj +++ b/mcs/class/System.Web/System.Web20.csproj @@ -1159,6 +1159,7 @@ + @@ -1447,4 +1448,4 @@ "$(ProjectDir)..\..\class\lib\net_2_0\culevel.exe" -o "$(ProjectDir)System.Web\UplevelHelper.cs" "$(ProjectDir)UplevelHelperDefinitions.xml" - \ No newline at end of file + -- GitLab