cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1292803 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
Date Thu, 23 Feb 2012 13:50:32 GMT
Author: sergeyb
Date: Thu Feb 23 13:50:31 2012
New Revision: 1292803

URL: http://svn.apache.org/viewvc?rev=1292803&view=rev
Log:
reverting r1292796

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 13:50:31 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1292050,1292373,1292766
-/cxf/trunk:1221366,1291943,1292763
+/cxf/branches/2.5.x-fixes:1292373,1292766
+/cxf/trunk:1221366,1292763

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

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java?rev=1292803&r1=1292802&r2=1292803&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
Thu Feb 23 13:50:31 2012
@@ -56,13 +56,10 @@ public final class HttpUtils {
     private static final ResourceBundle BUNDLE = BundleUtils.getBundle(HttpUtils.class);
     private static final Logger LOG = LogUtils.getL7dLogger(HttpUtils.class);
     
-    private static final String REQUEST_PATH_TO_MATCH = "path_to_match";
-    private static final String REQUEST_PATH_TO_MATCH_SLASH = "path_to_match_slash";
-    
     private static final String ANY_IP_ADDRESS = "0.0.0.0";
     private static final String ANY_IP_ADDRESS_START = "://0.0.0.0";
     private static final int DEFAULT_HTTP_PORT = 80;
-        
+    
     private static final Pattern ENCODE_PATTERN = Pattern.compile("%[0-9a-fA-F][0-9a-fA-F]");
     private static final String CHARSET_PARAMETER = "charset";
     
@@ -207,16 +204,9 @@ public final class HttpUtils {
     }
     
     public static String getPathToMatch(Message m, boolean addSlash) {
-        String var = addSlash ? REQUEST_PATH_TO_MATCH_SLASH : REQUEST_PATH_TO_MATCH;
-        String pathToMatch = (String)m.get(var);
-        if (pathToMatch != null) {
-            return pathToMatch; 
-        }
         String requestAddress = getProtocolHeader(m, Message.REQUEST_URI, "/");
         String baseAddress = getBaseAddress(m);
-        pathToMatch = getPathToMatch(requestAddress, baseAddress, addSlash);
-        m.put(var, pathToMatch);
-        return pathToMatch;
+        return getPathToMatch(requestAddress, baseAddress, addSlash);
     }
     
     public static String getProtocolHeader(Message m, String name, String defaultValue) {
@@ -270,8 +260,6 @@ public final class HttpUtils {
             path = "/" + path;
         }
         m.put(Message.REQUEST_URI, baseAddress + path);
-        m.remove(REQUEST_PATH_TO_MATCH);
-        m.remove(REQUEST_PATH_TO_MATCH_SLASH);
     }
 
     



Mime
View raw message