Merge pull request mono#498 from Unroll-Me/master

Fix HttpContextWrapper.Session when Session State is disabled
midnite8177 · Nov 30, 2012 · 9f3ef8e · 9f3ef8e
2 parents 0849155 + 3af5011
commit 9f3ef8e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs b/mcs/class/System.Web.Abstractions/System.Web/HttpContextWrapper.cs
@@ -127,7 +127,7 @@ public override HttpServerUtilityBase Server {
 		}
 
 		public override HttpSessionStateBase Session {
-			get { return new HttpSessionStateWrapper (w.Session); }
+			get { return w.Session == null ? null : new HttpSessionStateWrapper (w.Session); }
 		}
 
 		public override bool SkipAuthorization {