2008-11-25 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* HttpContext.cs: MS does not throw. They just return null.

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

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index 2e70b721a7db61a3193e1ecdf9e2adce761b2dee..1c7a811855adfa8c3f86e45d140e9afadf8b596a 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+
+2008-11-25 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * HttpContext.cs: MS does not throw. They just return null.
+
 2008-11-24  Marek Habersack  <mhabersack@novell.com>
 
        * HttpRuntime.cs: take PlatformID.MacOSX into account when

diff --git a/mcs/class/System.Web/System.Web/HttpContext.cs b/mcs/class/System.Web/System.Web/HttpContext.cs
index c7f399f6c5ab8f25a35cba85acb6b4e04c6d6425..fffd779b321c5deadce5b129a36b5608b5457667 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpContext.cs
+++ b/mcs/class/System.Web/System.Web/HttpContext.cs
@@ -514,8 +514,8 @@ namespace System.Web {
                                return ret;
                        
                        if (AppGlobalResourcesAssembly == null)
-                               throw new MissingManifestResourceException ();
-                       
+                               return null;
+
                        return GetResourceObject ("Resources." + classKey, resourceKey, culture, AppGlobalResourcesAssembly);
                }