cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1151156 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Date Tue, 26 Jul 2011 16:23:01 GMT
Author: sergeyb
Date: Tue Jul 26 16:23:00 2011
New Revision: 1151156

URL: http://svn.apache.org/viewvc?rev=1151156&view=rev
Log:
Merged revisions 1151155 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1151155 | sergeyb | 2011-07-26 17:20:54 +0100 (Tue, 26 Jul 2011) | 9 lines
  
  Merged revisions 1151152 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1151152 | sergeyb | 2011-07-26 17:17:22 +0100 (Tue, 26 Jul 2011) | 1 line
    
    [CXF-3689] Applying a patch on behalf of Qiu Zhan Bo
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
    cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 26 16:23:00 2011
@@ -1 +1,2 @@
-/cxf/branches/2.4.x-fixes:1149607
+/cxf/branches/2.4.x-fixes:1149607,1151155
+/cxf/trunk:1151152

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1151156&r1=1151155&r2=1151156&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
Tue Jul 26 16:23:00 2011
@@ -698,6 +698,7 @@ public class JettyHTTPDestinationTest ex
                 //EasyMock.expect(request.getMethod()).andReturn(method);            
                 EasyMock.expect(request.getInputStream()).andReturn(is);
                 EasyMock.expect(request.getContextPath()).andReturn("/bar");
+                EasyMock.expect(request.getServletPath()).andReturn("");
                 EasyMock.expect(request.getPathInfo()).andReturn("/foo");
                 EasyMock.expect(request.getRequestURI()).andReturn("/foo");
                 EasyMock.expect(request.getRequestURL()).andReturn(new StringBuffer("http://test/request"));

Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1151156&r1=1151155&r2=1151156&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
Tue Jul 26 16:23:00 2011
@@ -321,7 +321,12 @@ public abstract class AbstractHTTPDestin
         if (contextPath == null) {
             contextPath = "";
         }
-        inMessage.put(Message.PATH_INFO, contextPath + req.getPathInfo());
+        String servletPath = req.getServletPath();
+        if (servletPath == null) {
+            servletPath = "";
+        }
+        String contextServletPath = contextPath + servletPath;
+        inMessage.put(Message.PATH_INFO, contextServletPath + req.getPathInfo());
         
         String contentType = req.getContentType();
         String enc = HttpHeaderHelper.findCharset(contentType);
@@ -348,7 +353,7 @@ public abstract class AbstractHTTPDestin
         inMessage.put(Message.QUERY_STRING, req.getQueryString());
         inMessage.put(Message.CONTENT_TYPE, contentType);
         inMessage.put(Message.ACCEPT_CONTENT_TYPE, req.getHeader("Accept"));
-        String basePath = getBasePath(contextPath);
+        String basePath = getBasePath(contextServletPath);
         if (!StringUtils.isEmpty(basePath)) {
             inMessage.put(Message.BASE_PATH, basePath);
         }



Mime
View raw message