You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/10/01 18:31:45 UTC
[cxf] 01/02: CXF-8128: Fill address field in case of responses
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 51c0446ff43c0ffe5350e268b20f023bfacf3784
Author: kkrisz1 <kr...@gmail.com>
AuthorDate: Tue Oct 1 10:18:23 2019 +0200
CXF-8128: Fill address field in case of responses
(cherry picked from commit c46694d554cd087d2fccb35b10a691af501720fc)
---
.../cxf/ext/logging/event/DefaultLogEventMapper.java | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index dd3bcdb..1510200 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -86,10 +86,7 @@ public class DefaultLogEventMapper {
Map<String, String> headerMap = getHeaders(message);
event.setHeaders(headerMap);
- String uri = getUri(message);
- if (uri != null) {
- event.setAddress(uri);
- }
+ event.setAddress(getAddress(message, event));
event.setPrincipal(getPrincipal(message));
event.setBinaryContent(isBinaryContent(message));
@@ -155,6 +152,19 @@ public class DefaultLogEventMapper {
return result;
}
+ private String getAddress(Message message, LogEvent event) {
+ final Message observedMessage;
+ if (event.getType() == EventType.RESP_IN) {
+ observedMessage = message.getExchange().getOutMessage();
+ } else if (event.getType() == EventType.RESP_OUT) {
+ observedMessage = message.getExchange().getInMessage();
+ } else {
+ observedMessage = message;
+ }
+
+ return getUri(observedMessage);
+ }
+
private String getUri(Message message) {
String uri = safeGet(message, Message.REQUEST_URL);
if (uri == null) {