cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1225878 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
Date Fri, 30 Dec 2011 18:01:31 GMT
Author: sergeyb
Date: Fri Dec 30 18:01:30 2011
New Revision: 1225878

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

................
  r1225877 | sergeyb | 2011-12-30 17:54:10 +0000 (Fri, 30 Dec 2011) | 9 lines
  
  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.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 (original)
+++ svn:mergeinfo Fri Dec 30 18:01:30 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1221206,1221210,1221223,1221227,1221910,1222654,1225540
-/cxf/trunk:1221204,1221208,1221221,1221226,1222652,1225538
+/cxf/branches/2.4.x-fixes:1221206,1221210,1221223,1221227,1221910,1222654,1225540,1225877
+/cxf/trunk:1221204,1221208,1221221,1221226,1222652,1225538,1225876

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=1225878&r1=1225877&r2=1225878&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
Fri Dec 30 18:01:30 2011
@@ -180,6 +180,10 @@ public abstract class AbstractHTTPServle
     }
     
     private static boolean matchPath(List<String> values, String pathInfo) {
+        if (pathInfo == null) {
+            pathInfo = "/";
+        }
+
         for (String value : values) {
             if (pathInfo.matches(value)) {
                 return true;



Mime
View raw message