You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/12/19 21:43:19 UTC

cxf git commit: [CXF-6145] WS-RM demo server throws exception Patch from gwuireland applied This closes #41

Repository: cxf
Updated Branches:
  refs/heads/master 328a1a5cf -> a3be410fe


[CXF-6145]  WS-RM demo server throws exception
Patch from gwuireland applied
This closes #41


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a3be410f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a3be410f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a3be410f

Branch: refs/heads/master
Commit: a3be410fef912655c59776cd7827a81091b95d99
Parents: 328a1a5
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Dec 19 15:42:10 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Dec 19 15:42:10 2014 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a3be410f/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index 36f44d6..2e1a54b 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -178,8 +178,9 @@ public class DestinationSequence extends AbstractSequence {
         RMEndpoint reliableEndpoint = destination.getReliableEndpoint();
         RMConfiguration cfg = reliableEndpoint.getConfiguration();
         
-        scheduleAcknowledgement(cfg.getAcknowledgementIntervalTime());
-       
+        if (null == rmps.getCloseSequence()) {
+            scheduleAcknowledgement(cfg.getAcknowledgementIntervalTime());
+        }
         long inactivityTimeout = cfg.getInactivityTimeoutTime();
         scheduleSequenceTermination(inactivityTimeout);
     }