Author: keith Date: Thu Jun 5 08:44:49 2008 New Revision: 18033 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18033
Log: Fixing Mashup-850 Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java Modified: trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java?rev=18033&r1=18032&r2=18033&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/transport/ServiceUIFilter.java Thu Jun 5 08:44:49 2008 @@ -25,6 +25,7 @@ import org.wso2.mashup.requestprocessor.Utils; import org.wso2.mashup.utils.MashupUtils; import org.wso2.wsas.util.MIMEType2FileExtensionMap; +import org.wso2.adminui.AdminUIServletContextListener; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -83,16 +84,12 @@ if ((httpServletRequest.getMethod().equalsIgnoreCase("get")) && (httpServletRequest.getQueryString() == null)) { - String contextRoot = configContext.getContextRoot(); - String serviceRoot = configContext.getServiceContextPath(); - String fullRoot; - //Ignore the contextRoot if it's just '/' - if (contextRoot.indexOf('/') > 1) { - fullRoot = contextRoot + serviceRoot + "/"; - } else { - fullRoot = serviceRoot + "/"; + String contextRoot = AdminUIServletContextListener.contextPath; + if (!contextRoot.endsWith(MashupConstants.FORWARD_SLASH)) { + contextRoot = contextRoot + MashupConstants.FORWARD_SLASH; } - + String serviceRoot = configContext.getServicePath(); + String fullRoot = contextRoot + serviceRoot + "/"; String requestURI = ((HttpServletRequest) request).getRequestURI(); //Ignore if the requestURI does not start with _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
