refactoring:

[mono.git] / mcs / class / Mainsoft.Web / Mainsoft.Web.Hosting / SessionWrapper.cs

diff --git a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/SessionWrapper.cs b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/SessionWrapper.cs
index aeb76e665d144cf9ffc98a29ece79e72644d3b16..5af48a481237605400d63e3b9ba6d62c87be699b 100644 (file)
--- a/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/SessionWrapper.cs
+++ b/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/SessionWrapper.cs
@@ -17,15 +17,8 @@ namespace Mainsoft.Web.Hosting
 \r
                        if (IRequiresSessionStateType.IsAssignableFrom (type))\r
                                return IReadOnlySessionStateType.IsAssignableFrom (type) ?\r
-                                       new ReadOnlySessionWrapperHandler (handler) : new SessionWrapperHandler (handler);\r
-                       return handler;\r
-               }\r
-               public static IHttpHandler WrapHandler (IHttpExtendedHandler handler) {\r
-                       Type type = (Type) ((IServiceProvider) handler).GetService (typeof (Type));\r
-\r
-                       if (IRequiresSessionStateType.IsAssignableFrom (type))\r
-                               return IReadOnlySessionStateType.IsAssignableFrom (type) ?\r
-                                       new ReadOnlySessionWrapperExtendedHandler (handler) : new SessionWrapperExtendedHandler (handler);\r
+                                       (handler is IHttpExtendedHandler ? (IHttpHandler) new ReadOnlySessionWrapperExtendedHandler ((IHttpExtendedHandler) handler) : new ReadOnlySessionWrapperHandler (handler)) :\r
+                                       (handler is IHttpExtendedHandler ? new SessionWrapperExtendedHandler ((IHttpExtendedHandler) handler) : new SessionWrapperHandler (handler));\r
                        return handler;\r
                }\r
 \r