Author: kostat
Date: 2007-12-03 09:27:48 -0500 (Mon, 03 Dec 2007)
New Revision: 90545

Modified:
   
branches/mainsoft/JSF/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
Log:
remove dead code

Modified: 
branches/mainsoft/JSF/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
===================================================================
--- 
branches/mainsoft/JSF/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
        2007-12-03 14:10:08 UTC (rev 90544)
+++ 
branches/mainsoft/JSF/mcs/class/Mainsoft.Web/Mainsoft.Web.Hosting/BaseHttpServlet.cs
        2007-12-03 14:27:48 UTC (rev 90545)
@@ -62,15 +62,11 @@
                override public void init(ServletConfig config)
                {
                        base.init(config);
-                       InitRuntime (config, this, GetDeserializer (), 
getDriverUtils ());
+                       InitRuntime (config, this);
                }
 
-               public static void InitRuntime (ServletConfig config, object 
evidence,
-                       [EMAIL PROTECTED] deserializer, [EMAIL PROTECTED] 
driverUtils) {
+               public static void InitRuntime (ServletConfig config, object 
evidence) {
                        AppDomain servletDomain = createServletDomain (config);
-                       // Mordechai : setting the web app deserializer object.
-                       servletDomain.SetData (J2EEConsts.DESERIALIZER_CONST, 
deserializer);
-                       servletDomain.SetData ([EMAIL PROTECTED], driverUtils);
                        [EMAIL PROTECTED] (servletDomain);
 
                        try {
@@ -80,7 +76,7 @@
                                servletDomain.SetData (".domainId", 
currentTime.ToString ("x"));
                                currentTime = ~currentTime;
                                servletDomain.SetData (".appId", 
currentTime.ToString ("x"));
-                               servletDomain.SetData (".appName", 
context.getServletContextName ());
+                               servletDomain.SetData (".appName", 
servletDomain.SetupInformation.ApplicationName);
 
                                servletDomain.SetData (J2EEConsts.CLASS_LOADER, 
java.lang.Thread.currentThread ().getContextClassLoader ());
                                //servletDomain.SetData 
(J2EEConsts.CLASS_LOADER, vmw.common.TypeUtils.ToClass 
(evidence).getClassLoader ());
@@ -247,36 +243,7 @@
                                //servletDomain.SetData(".hostingInstallDir", 
"/");
                                return servletDomain;
                }
-       
-               virtual protected [EMAIL PROTECTED] GetDeserializer()
-               {
-                       return new GHWebDeseserializer ();
-               }
-
-               /// Mordechai: This class comes to solve a problem in class 
deserialize
-               /// within web application. The problem is that the classloader 
that created 
-               /// some user web class (for example aspx page) is not the 
class loader
-               /// that de-serialize it - thus we end with 
ClassDefNotFoundException.
-               /// To prevent this situation we delegate the serialization 
back the the 
-               /// web app (which has the correct class loader...)
-               /// 
-
-               virtual protected [EMAIL PROTECTED] getDriverUtils()
-               {
-                       //by default no driver utils, the specific servlet will 
override this method
-                       return null;
-               }
        }
-
-       class GHWebDeseserializer : [EMAIL PROTECTED] 
-       {
-
-                       Object [EMAIL PROTECTED](java.io.ObjectInputStream 
stream)
-                       {
-                               object obj = stream.readObject();
-                               return obj;
-                       }
-       }
 }
 
 namespace System.Web.GH

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to