svn commit: r1073813 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java

[dkulp]

Author: dkulp
Date: Wed Feb 23 16:35:45 2011
New Revision: 1073813

URL: http://svn.apache.org/viewvc?rev=1073813&view=rev
Log:
Merged revisions 1073107 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1073107 | sergeyb | 2011-02-21 13:32:29 -0500 (Mon, 21 Feb 2011) | 1 line
  
  Minor update to AbstractHTTPServlet for the redirection filter to report the 
request URI properly
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java

Propchange: cxf/branches/2.3.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: 
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java?rev=1073813&r1=1073812&r2=1073813&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
 Wed Feb 23 16:35:45 2011
@@ -263,8 +263,7 @@ public abstract class AbstractHTTPServle
         
         @Override
         public String getRequestURI() {
-            String query = super.getQueryString();
-            return query != null ? pathInfo + "?" + query : pathInfo; 
+            return getContextPath() + servletPath + pathInfo;
         }
         
     }