* HttpRequest.cs: fixed MapPath, removed TARGET_J2EE block that checks war root symbol

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

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index f1a6a5e675dcd8fad055ca4cf0e31873370c75d5..e6e2fd7fcfd3d49c4928264c68b0bf3e950bc5fb 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-20  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * HttpRequest.cs: fixed MapPath, removed TARGET_J2EE block that checks
+       war root symbol
+
 2007-02-19  Marek Habersack  <grendello@gmail.com>
 
        * HttpContext.cs: Make sure all the global resource objects are

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
index a569f6f71d5f40bd0fa80b046a942616bcd3d688..1f78568eb16f0a484f6c0fc1a25fd1b4e7ea9b63 100644 (file)
--- a/mcs/class/System.Web/System.Web/HttpRequest.cs
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -1114,10 +1114,6 @@ namespace System.Web {
                                throw new ArgumentNullException (
                                        String.Format ("MapPath: Invalid path '{0}', only virtual paths are accepted", virtualPath));
 
-#if TARGET_J2EE
-                       if (virtualPath.StartsWith(vmw.common.IAppDomainConfig.WAR_ROOT_SYMBOL))                        
-                               return  virtualPath;                    
-#endif 
                        string appVirtualPath = HttpRuntime.AppDomainAppVirtualPath;
                        if (baseVirtualDir == null)
                                baseVirtualDir = appVirtualPath;