Merge pull request #498 from Unroll-Me/master

Fix HttpContextWrapper.Session when Session State is disabled

diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
index 66e99f2610616786a64eb56b06cf1a35646b2e95..22feb8530d7193050ee835f034ae9af5dd08beab 100644 (file)
--- a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
+++ b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
@@ -127,7 +127,7 @@ namespace System.Web
                }
 
                public override HttpSessionStateBase Session {
-                       get { return new HttpSessionStateWrapper (w.Session); }
+                       get { return w.Session == null ? null : new HttpSessionStateWrapper (w.Session); }
                }
 
                public override bool SkipAuthorization {