svn commit: r1244129 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java

[sergeyb]

Author: sergeyb
Date: Tue Feb 14 17:09:14 2012
New Revision: 1244129

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

........
  r1244128 | sergeyb | 2012-02-14 17:07:21 +0000 (Tue, 14 Feb 2012) | 1 line
  
  [CXf-4109] Removing a reference to URI.getHost()
........

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

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 14 17:09:14 2012
@@ -1 +1 @@
-/cxf/trunk:1236720,1241934,1242263,1242359,1242729,1242739,1242840-1242842,1242847,1242948,1243432,1243620,1243727,1243926
+/cxf/trunk:1236720,1241934,1242263,1242359,1242729,1242739,1242840-1242842,1242847,1242948,1243432,1243620,1243727,1243926,1244128

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

Modified: 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java?rev=1244129&r1=1244128&r2=1244129&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
 Tue Feb 14 17:09:14 2012
@@ -57,6 +57,7 @@ public final class HttpUtils {
     private static final Logger LOG = LogUtils.getL7dLogger(HttpUtils.class);
     
     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]");
@@ -186,7 +187,7 @@ public final class HttpUtils {
         HttpServletRequest request = 
             
(HttpServletRequest)message.get(AbstractHTTPDestination.HTTP_REQUEST);
         boolean absolute = u.isAbsolute();
-        if (request != null && (!absolute || 
u.getHost().equals(ANY_IP_ADDRESS))) {
+        if (request != null && (!absolute || 
u.toString().contains(ANY_IP_ADDRESS_START))) {
             String serverAndPort = request.getServerName();
             int port = request.getLocalPort();
             if (port != DEFAULT_HTTP_PORT) {