cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [cxf] branch master updated: [CXF-7745]:Fix NPE thrown when replyTo is non-anonymous and faultTo doesn't exists
Date Fri, 01 Jun 2018 02:59:14 GMT
This is an automated email from the ASF dual-hosted git repository.

ema pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new b754fad  [CXF-7745]:Fix NPE thrown when replyTo is non-anonymous and faultTo doesn't
exists
b754fad is described below

commit b754fadd4f031f652e8f943f426cbc1683d6662c
Author: Jim Ma <ema@apache.org>
AuthorDate: Fri Jun 1 10:57:23 2018 +0800

    [CXF-7745]:Fix NPE thrown when replyTo is non-anonymous and faultTo doesn't exists
---
 .../java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
index de87426..e9d32e1 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorImpl.java
@@ -577,8 +577,8 @@ public class MAPAggregatorImpl extends MAPAggregator {
             && isAnonymous) {
             passed = true;
         } else if (WSAddressingFeature.AddressingResponses.NON_ANONYMOUS == addressingResponses
-                   && (!anonReply && (faultTo.getAddress() != null &&
!anonFault)
-                       || !anonReply && faultTo.getAddress() == null)) {
+                   && (!anonReply && (!anonFault && faultTo.getAddress()
!= null)
+                       || !anonReply && faultTo == null)) {        
             passed = true;
         }
         if (!passed) {

-- 
To stop receiving notification emails like this one, please contact
ema@apache.org.

Mime
View raw message