svn commit: r1540130 - in /cxf/branches/2.7.x-fixes: ./ api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java

[sergeyb]

Author: sergeyb
Date: Fri Nov  8 17:24:02 2013
New Revision: 1540130

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

........
  r1540127 | sergeyb | 2013-11-08 17:17:34 +0000 (Fri, 08 Nov 2013) | 1 line
  
  [CXF-5377] Check REQUEST_URI if no REQUEST_URL property is available
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java

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

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

Modified: 
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?rev=1540130&r1=1540129&r2=1540130&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
 Fri Nov  8 17:24:02 2013
@@ -116,6 +116,9 @@ public class LoggingInInterceptor extend
             buffer.getHeader().append(headers);
         }
         String uri = (String)message.get(Message.REQUEST_URL);
+        if (uri == null) {
+            uri = (String)message.get(Message.REQUEST_URI);
+        } 
         if (uri != null) {
             buffer.getAddress().append(uri);
             String query = (String)message.get(Message.QUERY_STRING);