cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1225877 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
Date Fri, 30 Dec 2011 17:54:11 GMT
Author: sergeyb
Date: Fri Dec 30 17:54:10 2011
New Revision: 1225877

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

........
  r1225876 | sergeyb | 2011-12-30 17:50:44 +0000 (Fri, 30 Dec 2011) | 1 line
  
  Adding a null guard to AbstractHttpServlet
........

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

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 30 17:54:10 2011
@@ -1 +1 @@
-/cxf/trunk:1225217,1225494,1225521,1225538,1225563
+/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876

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

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java?rev=1225877&r1=1225876&r2=1225877&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
Fri Dec 30 17:54:10 2011
@@ -187,6 +187,9 @@ public abstract class AbstractHTTPServle
     
     private boolean matchPath(List<String> values, HttpServletRequest request) {
         String path = request.getPathInfo();
+        if (path == null) {
+            path = "/";
+        }
         if (redirectQueryCheck) {
             String queryString = request.getQueryString();
             if (queryString != null && queryString.length() > 0) {



Mime
View raw message