Repository: cxf Updated Branches: refs/heads/3.1.x-fixes b0035ade0 -> 8c7a97734
[CXF-6721] Preventing NPE Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c7a9773 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c7a9773 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c7a9773 Branch: refs/heads/3.1.x-fixes Commit: 8c7a97734fd3db3423bf359d4fdb44305ef45cc4 Parents: b0035ad Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Fri Jan 15 10:14:30 2016 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Fri Jan 15 10:15:30 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8c7a9773/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 a9fe043..17a07bf 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 @@ -191,7 +191,8 @@ public class DefaultLogEventMapper implements LogEventMapper { private String getMessageId(Message message) { AddressingProperties addrProp = ContextUtils.retrieveMAPs(message, false, MessageUtils.isOutbound(message), false); - return (addrProp != null) ? addrProp.getMessageID().getValue() : UUID.randomUUID().toString(); + return addrProp != null && addrProp.getMessageID() != null + ? addrProp.getMessageID().getValue() : UUID.randomUUID().toString(); } private String getOperationName(Message message) {
