You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/10/16 12:20:39 UTC
svn commit: r464440 -
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
Author: chinthaka
Date: Mon Oct 16 03:20:33 2006
New Revision: 464440
URL: http://svn.apache.org/viewvc?view=rev&rev=464440
Log:
(This might fix http://issues.apache.org/jira/browse/AXIS2-1220 as well.)
The context root might be already set to the config context, before coming to initContextRoot. So before loading it from the request and assigning to the local variable, first search in config context and if not only continue your work of calculating the proper context path.
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=464440&r1=464439&r2=464440
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Mon Oct 16 03:20:33 2006
@@ -124,7 +124,8 @@
* @param req
*/
public void initContextRoot(HttpServletRequest req) {
- if (contextRoot == null) {
+
+ if (contextRoot == null && ((contextRoot = configContext.getContextRoot()) == null)) {
String [] parts = JavaUtils.split(req.getContextPath(), '/');
if (parts != null) {
for (int i = 0; i < parts.length; i++) {
@@ -340,6 +341,7 @@
if (parameter != null) {
disableSeperateEndpointForREST = !JavaUtils.isFalseExplicitly(parameter.getValue());
}
+
}
public void init() throws ServletException {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org