Fix unit test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f092b809 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f092b809 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f092b809 Branch: refs/heads/3.1.x-fixes Commit: f092b809c7ba8604d72830729d8f05c0e7604417 Parents: 18f0632 Author: Daniel Kulp <[email protected]> Authored: Thu Feb 9 14:08:06 2017 -0500 Committer: Daniel Kulp <[email protected]> Committed: Tue Feb 14 09:53:46 2017 -0500 ---------------------------------------------------------------------- .../logging/event/DefaultLogEventMapper.java | 30 +++----------------- 1 file changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f092b809/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java ---------------------------------------------------------------------- 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 8324dae..abf3a06 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 @@ -29,7 +29,6 @@ import java.util.Set; import java.util.UUID; import javax.security.auth.Subject; -import javax.xml.stream.XMLStreamReader; import org.apache.cxf.binding.Binding; import org.apache.cxf.configuration.security.AuthorizationPolicy; @@ -42,7 +41,6 @@ import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.service.model.InterfaceInfo; import org.apache.cxf.service.model.ServiceInfo; -import org.apache.cxf.service.model.ServiceModelUtil; import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.ContextUtils; @@ -156,7 +154,7 @@ public class DefaultLogEventMapper implements LogEventMapper { } uri = address + uri; } - } else { + } else if (address != null) { uri = address; } } @@ -207,19 +205,6 @@ public class DefaultLogEventMapper implements LogEventMapper { BindingOperationInfo boi = null; boi = message.getExchange().getBindingOperationInfo(); - if (null == boi) { - boi = getOperationFromContent(message); - } - - if (null == boi) { - Message inMsg = message.getExchange().getInMessage(); - if (null != inMsg) { - Message reqMsg = inMsg.getExchange().getInMessage(); - if (null != reqMsg) { - boi = getOperationFromContent(reqMsg); - } - } - } if (null != boi) { operationName = boi.getName().toString(); @@ -228,15 +213,6 @@ public class DefaultLogEventMapper implements LogEventMapper { return operationName; } - private BindingOperationInfo getOperationFromContent(Message message) { - XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class); - if (xmlReader != null) { - return ServiceModelUtil.getOperation(message.getExchange(), xmlReader.getName()); - } else { - return null; - } - } - private Message getEffectiveMessage(Message message) { boolean isRequestor = MessageUtils.isRequestor(message); boolean isOutbound = MessageUtils.isOutbound(message); @@ -258,7 +234,9 @@ public class DefaultLogEventMapper implements LogEventMapper { String requestUri = safeGet(message, Message.REQUEST_URI); if (requestUri != null) { String basePath = safeGet(message, Message.BASE_PATH); - if (basePath != null && requestUri.startsWith(basePath)) { + if (basePath == null) { + path = requestUri; + } else if (requestUri.startsWith(basePath)) { path = requestUri.substring(basePath.length()); } if (path.isEmpty()) {
