midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* BF [2787006] Repeated redirect for invalid url 

* Generator - typo, produce xml that's not well form
This commit is contained in:
Heng Sin Low 2009-05-05 04:50:21 +00:00
parent 5241a5d6c9
commit 270dc8d679
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java
View File

@ -93,8 +93,10 @@ public class RequestAnalyzer
m_ctx = servlet.getCtx (); m_ctx = servlet.getCtx ();
m_requestURL = m_request.getRequestURL ().toString (); m_requestURL = m_request.getRequestURL ().toString ();
m_serverName = m_request.getServerName (); m_serverName = m_request.getServerName ();
m_baseURL = m_requestURL.substring (0, m_requestURL.indexOf (m_serverName) int baseStart = m_requestURL.indexOf(m_request.getContextPath(), m_requestURL.indexOf (m_serverName) + m_serverName.length ());
+ m_serverName.length () + servletExtend.length ()) if (baseStart <= 0)
baseStart = m_requestURL.indexOf (m_serverName) + m_serverName.length ();
m_baseURL = m_requestURL.substring (0, baseStart + servletExtend.length ())
+ m_request.getContextPath (); + m_request.getContextPath ();
m_relativeURL = m_requestURL.substring (m_baseURL.length ()); m_relativeURL = m_requestURL.substring (m_baseURL.length ());
// If RelativeURL is empty it should be / // If RelativeURL is empty it should be /
@ -121,7 +123,9 @@ public class RequestAnalyzer
m_WebProject = webProjectCache.getWebProject (defaultID[0]); m_WebProject = webProjectCache.getWebProject (defaultID[0]);
else { else {
m_isRedirect = true; m_isRedirect = true;
m_redirectURL = m_requestURL + "admin/"; m_redirectURL
= m_requestURL.substring(0, m_requestURL.indexOf("/", m_requestURL.indexOf (m_serverName) + m_serverName.length ()));
m_redirectURL += "/admin/";
} }
// JJ // JJ
//throw new IllegalStateException("Unknown context - Set up Web Project"); // no known context //throw new IllegalStateException("Unknown context - Set up Web Project"); // no known context

2
webCM/src/main/servlet/org/compiere/cm/xml/Generator.java
View File

@ -106,7 +106,7 @@ public class Generator
private void generateSystemHeader (HttpServletCM thisServlet) private void generateSystemHeader (HttpServletCM thisServlet)
{ {
xmlCode.append ("<system>\n"); xmlCode.append ("<system>\n");
xmlCode.append ("<compiere>\n"); xmlCode.append ("<adempiere>\n");
xmlCode.append ("<mainversion>" + Adempiere.MAIN_VERSION xmlCode.append ("<mainversion>" + Adempiere.MAIN_VERSION
+ "</mainversion>\n"); + "</mainversion>\n");
xmlCode.append ("<dateversion>" + Adempiere.DATE_VERSION xmlCode.append ("<dateversion>" + Adempiere.DATE_VERSION