cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1449748 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
Date Mon, 25 Feb 2013 15:28:56 GMT
Author: sergeyb
Date: Mon Feb 25 15:28:56 2013
New Revision: 1449748

URL: http://svn.apache.org/r1449748
Log:
Merged revisions 1449747 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1449747 | sergeyb | 2013-02-25 15:27:46 +0000 (Mon, 25 Feb 2013) | 1 line
  
  [CXF-4852] Minor fix to prevent NPE when new URI is the same as the base one
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1449747

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

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java?rev=1449748&r1=1449747&r2=1449748&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
Mon Feb 25 15:28:56 2013
@@ -92,7 +92,10 @@ public class ContainerRequestContextImpl
                 setRequestUri(requestUri, URI.create("/"));
                 return;
             } else {
-                requestUriString = requestUriString.substring(baseUriString.length() + 1);
+                requestUriString = requestUriString.substring(baseUriString.length());
+                if (requestUriString.isEmpty()) {
+                    requestUriString = "/";
+                }
                 requestUri = URI.create(requestUriString);
             }
                 



Mime
View raw message