This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 134b173f26ccf58d60fe1bcaac9d253a1449feb9 Author: Daniel Kulp <[email protected]> AuthorDate: Mon Feb 26 12:23:19 2018 -0500 [CXF-7508] TerminateSequenceResponse does not have acknowledgments --- rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java index b0ab022..90f0820 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMOutInterceptor.java @@ -111,7 +111,8 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> { // add Acknowledgements (to application messages or explicitly created Acknowledgement messages only) boolean isAck = constants.getSequenceAckAction().equals(action); boolean isClose = constants.getCloseSequenceAction().equals(action); - if (isApplicationMessage || isAck || isClose) { + boolean isTerminate = constants.getTerminateSequenceAction().equals(action); + if (isApplicationMessage || isAck || isClose || isTerminate) { AttributedURIType to = maps.getTo(); assert null != to; addAcknowledgements(destination, rmpsOut, inSeqId, to); @@ -121,7 +122,7 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> { isAck = true; } } - if (isAck || (constants.getTerminateSequenceAction().equals(action) + if (isAck || (isTerminate && RM10Constants.NAMESPACE_URI.equals(rmNamespace))) { maps.setReplyTo(RMUtils.createNoneReference()); } @@ -165,6 +166,9 @@ public class RMOutInterceptor extends AbstractRMInterceptor<Message> { } void addAcknowledgements(Destination destination, RMProperties rmpsOut, Identifier inSeqId, AttributedURIType to) { + if (destination == null) { + return; + } for (DestinationSequence seq : destination.getAllSequences()) { if (!seq.sendAcknowledgement()) { if (LOG.isLoggable(Level.FINE)) { -- To stop receiving notification emails like this one, please contact [email protected].
