This is an automated email from the ASF dual-hosted git repository.

dkulp pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 906f7618c90e484b7532778ac73dc5f2067328c8
Author: Daniel Kulp <[email protected]>
AuthorDate: Mon Feb 26 12:13:37 2018 -0500

    For wsrm 1.2, make sure the TerminateSequenceResponseType is returned
    
    (cherry picked from commit 9fd0678b244dd9f9996af6255d6ad882abbce30b)
    
    # Conflicts:
    #   rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
---
 rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
index 80a64bc..151ab0a 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Servant.java
@@ -239,14 +239,10 @@ public class Servant implements Invoker {
         Destination destination = reliableEndpoint.getDestination();
         Identifier sid = terminate.getIdentifier();
         DestinationSequence terminatedSeq = destination.getSequence(sid);
-        if (null == terminatedSeq) {
-            //  TODO
-            LOG.severe("No such sequence.");
-            return null;
-        } 
+        if (null != terminatedSeq) {
+            destination.terminateSequence(terminatedSeq);
+        }
 
-        destination.terminateSequence(terminatedSeq);
-        
         // the following may be necessary if the last message for this 
sequence was a oneway
         // request and hence there was no response to which a last message 
could have been added
         

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to