Author: sergeyb
Date: Tue Nov 19 13:59:28 2013
New Revision: 1543433
URL: http://svn.apache.org/r1543433
Log:
[CXF-5377] Updating LoggingInInterceptor to try to log the request URI even if
REQUEST_URI is not set
Modified:
cxf/trunk/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
Modified:
cxf/trunk/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java?rev=1543433&r1=1543432&r2=1543433&view=diff
==============================================================================
---
cxf/trunk/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
(original)
+++
cxf/trunk/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
Tue Nov 19 13:59:28 2013
@@ -118,15 +118,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) {