Author: sergeyb
Date: Tue Nov 19 14:03:53 2013
New Revision: 1543436
URL: http://svn.apache.org/r1543436
Log:
Merged revisions 1543433 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1543433 | sergeyb | 2013-11-19 13:59:28 +0000 (Tue, 19 Nov 2013) | 1 line
[CXF-5377] Updating LoggingInInterceptor to try to log the request URI even
if REQUEST_URI is not set
........
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:r1543433
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=1543436&r1=1543435&r2=1543436&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
Tue Nov 19 14:03:53 2013
@@ -117,15 +117,17 @@ public class LoggingInInterceptor extend
}
String uri = (String)message.get(Message.REQUEST_URL);
if (uri == null) {
+ String address = (String)message.get(Message.ENDPOINT_ADDRESS);
uri = (String)message.get(Message.REQUEST_URI);
if (uri != null && uri.startsWith("/")) {
- String address = (String)message.get(Message.ENDPOINT_ADDRESS);
if (address != null && !address.startsWith(uri)) {
if (address.endsWith("/") && address.length() > 1) {
address = address.substring(0, address.length());
}
uri = address + uri;
}
+ } else {
+ uri = address;
}
}
if (uri != null) {
