Author: seanoc
Date: Fri Apr 20 03:11:26 2007
New Revision: 530726
URL: http://svn.apache.org/viewvc?view=rev&rev=530726
Log:
Change to pass full URL into QueryHandler.
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?view=diff&rev=530726&r1=530725&r2=530726
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Fri Apr 20 03:11:26 2007
@@ -142,7 +142,7 @@
}
QueryHandlerRegistry queryHandlerRegistry =
bus.getExtension(QueryHandlerRegistry.class);
if (queryHandlerRegistry != null) {
- String requestURL = req.getRequestURI() + "?" +
req.getQueryString();
+ String requestURL = req.getRequestURL() + "?" +
req.getQueryString();
String pathInfo = req.getPathInfo();
for (QueryHandler qh : queryHandlerRegistry.getHandlers()) {
if (qh.isRecognizedQuery(requestURL, pathInfo, endpointInfo)) {
Modified:
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?view=diff&rev=530726&r1=530725&r2=530726
==============================================================================
---
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
(original)
+++
incubator/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Fri Apr 20 03:11:26 2007
@@ -531,8 +531,8 @@
EasyMock.expectLastCall().andReturn(queryHandlerRegistry);
queryHandlerRegistry.getHandlers();
EasyMock.expectLastCall().andReturn(queryHandlerList);
- request.getRequestURI();
- EasyMock.expectLastCall().andReturn("http://localhost/bar/foo");
+ request.getRequestURL();
+ EasyMock.expectLastCall().andReturn(new
StringBuffer("http://localhost/bar/foo"));
request.getPathInfo();
EasyMock.expectLastCall().andReturn("/bar/foo");
request.getQueryString();