Browse Source

TARGET_J2EE: for portlet do not apply 'auto' logic for culture

svn path=/trunk/mcs/; revision=75878
Konstantin Triger 19 years ago
parent
commit
6dcaa4198e

+ 4 - 0
mcs/class/System.Web/System.Web.UI/Page.cs

@@ -732,6 +732,10 @@ public partial class Page : TemplateControl, IHttpHandler
 			return deflt;
 		CultureInfo ret = null;
 		if (culture.StartsWith ("auto", StringComparison.InvariantCultureIgnoreCase)) {
+#if TARGET_J2EE
+			if (Context.IsPortletRequest)
+				return deflt;
+#endif
 			string[] languages = Request.UserLanguages;
 			try {
 				if (languages != null && languages.Length > 0)

+ 3 - 0
mcs/class/System.Web/System.Web/HttpContext.jvm.cs

@@ -32,6 +32,7 @@ using System.Collections;
 using System.Configuration;
 using System.Threading;
 using javax.servlet.http;
+using [email protected];
 
 namespace System.Web {
 	
@@ -86,6 +87,8 @@ namespace System.Web {
 			get { return false; }
 		}
 
+		internal bool IsPortletRequest { get { return ServletRequest is IPortletRequest; } }
+
 		internal void BeginTimeoutPossible ()
 		{
 		}