2006-11-22 Miguel de Icaza <miguel@novell.com>

	* SessionStateSection.cs: Do not call Enum.Parse with a null
	argument, prevents an exception from being thrown.

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

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
index e591e2826bd67f87d4d3f4522a53dbe2e71e52c5..4801860aa61c71556b33c3e9656b20f1a2cab2f6 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-22  Miguel de Icaza  <miguel@novell.com>
+
+       * SessionStateSection.cs: Do not call Enum.Parse with a null
+       argument, prevents an exception from being thrown.
+
 2006-11-20  Marek Habersack  <grendello@gmail.com>
 
        * GlobalizationSection.cs: Added support for "auto" cultures and

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs
index b0d9d2b0958dfaab58ff7cfd4fec1c187d9c1234..bc356a33a3d1f81891567b568293fc803176cbe6 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/SessionStateSection.cs
@@ -223,8 +223,10 @@ namespace System.Web.Configuration {
 
                HttpCookieMode ParseCookieMode (string s)
                {
-                       if (s == "true") return HttpCookieMode.UseUri;
-                       else if (s == "false") return HttpCookieMode.UseCookies;
+                       if (s == "true")
+                               return HttpCookieMode.UseUri;
+                       else if (s == "false" || s == null)
+                               return HttpCookieMode.UseCookies;
                        else {
                                try {
                                        return (HttpCookieMode)Enum.Parse (typeof(HttpCookieMode), s);