* HttpRuntime.cs: Avoid ANE on Windows when HttpRuntime is used

outside of ASP.NET. Fixed compiler warning by setting
assemblyMappingEnabled.

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

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index c4828abf0f5988542fa45be9d69b457e489ff8c3..fe5b39fe49a0f6c72a7d2e6db31a08fc222a9b83 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-03  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * HttpRuntime.cs: Avoid ANE on Windows when HttpRuntime is used
+       outside of ASP.NET. Fixed compiler warning by setting
+       assemblyMappingEnabled.
+
 2009-04-02  Marek Habersack  <mhabersack@novell.com>
 
        * HttpException.cs: if there are more lines with errors, display

diff --git a/mcs/class/System.Web/System.Web/HttpRuntime.cs b/mcs/class/System.Web/System.Web/HttpRuntime.cs
index e503d5d330f415b9ea8e6d945d0ad35c465aa49b..041897fc6b475771b588e58ca0e61703a4c8cb7a 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRuntime.cs
+++ b/mcs/class/System.Web/System.Web/HttpRuntime.cs
@@ -143,7 +143,8 @@ namespace System.Web {
 
                        if (runningOnWindows) {
                                caseInsensitive = true;
-                               isunc = new Uri (AppDomainAppPath).IsUnc;
+                               if (AppDomainAppPath != null)
+                                       isunc = new Uri (AppDomainAppPath).IsUnc;
                        } else {
                                string mono_iomap = Environment.GetEnvironmentVariable ("MONO_IOMAP");
                                if (mono_iomap != null) {
@@ -716,6 +717,7 @@ namespace System.Web {
                                        AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler (ResolveAssemblyHandler);
                                else
                                        AppDomain.CurrentDomain.AssemblyResolve -= new ResolveEventHandler (ResolveAssemblyHandler);
+                               assemblyMappingEnabled = enable;
                        }
                }
 #endif // #if !TARGET_J2EE
@@ -728,7 +730,6 @@ namespace System.Web {
                        get { return caseInsensitive; }
                }
 
-        
                internal static TraceManager TraceManager {
                        get {
                                return trace_manager;