Author: sergeyb Date: Wed Nov 17 12:50:43 2010 New Revision: 1036014 URL: http://svn.apache.org/viewvc?rev=1036014&view=rev Log: Merged revisions 1036007 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1036007 | sergeyb | 2010-11-17 12:43:18 +0000 (Wed, 17 Nov 2010) | 9 lines Merged revisions 1036004 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1036004 | sergeyb | 2010-11-17 12:40:35 +0000 (Wed, 17 Nov 2010) | 1 line Minor fix to do with handling trailing slashes for WADL queries working well ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Nov 17 12:50:43 2010 @@ -0,0 +1,2 @@ +/cxf/branches/2.3.x-fixes:1036007 +/cxf/trunk:1036004 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java?rev=1036014&r1=1036013&r2=1036014&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java Wed Nov 17 12:50:43 2010 @@ -170,8 +170,8 @@ public class RequestPreprocessor { public Response checkMetadataRequest(Message m) { String query = (String)m.get(Message.QUERY_STRING); if (query != null && query.contains(WadlGenerator.WADL_QUERY)) { - String requestURI = (String)m.get(Message.REQUEST_URI); - String baseAddress = HttpUtils.getBaseAddress(m); + String requestURI = getValueWithoutSlash((String)m.get(Message.REQUEST_URI)); + String baseAddress = getValueWithoutSlash(HttpUtils.getBaseAddress(m)); if (baseAddress.equals(requestURI)) { List<ProviderInfo<RequestHandler>> shs = ProviderFactory.getInstance(m).getRequestHandlers(); // this is actually being tested by ProviderFactory unit tests but just in case @@ -184,6 +184,10 @@ public class RequestPreprocessor { return null; } + private static String getValueWithoutSlash(String value) { + return value.endsWith("/") ? value.substring(0, value.length() - 1) : value; + } + public Response checkCodeRequest(Message m) { String query = (String)m.get(Message.QUERY_STRING); if (query != null && (query.contains(CodeGeneratorProvider.CODE_QUERY)
