cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsosno...@apache.org
Subject [2/5] git commit: Revert "Only add Sequence to RM protocol message for last message when using RM" Eliminate redundant change after Aki's commit. This reverts commit a2962773cbad6c88cb4d651c3199e45b352a5972.
Date Mon, 23 Jun 2014 01:33:09 GMT
Revert "Only add Sequence to RM protocol message for last message when using RM"
Eliminate redundant change after Aki's commit.
This reverts commit a2962773cbad6c88cb4d651c3199e45b352a5972.


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

Branch: refs/heads/master
Commit: fcf3c8a7223e5605e4fe55b74d30dd9f6924ebc1
Parents: eb3d8f4
Author: dsosnoski <dsosnoski@apache.org>
Authored: Fri May 16 14:04:02 2014 +1200
Committer: dsosnoski <dsosnoski@apache.org>
Committed: Sun Jun 22 20:35:58 2014 +1200

----------------------------------------------------------------------
 .../java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf3c8a7/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
index daa2012..2c5e832 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java
@@ -142,12 +142,7 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message>
 {
         }
         
         Map<?, ?> invocationContext = (Map<?, ?>)msg.get(Message.INVOCATION_CONTEXT);
-        
-        // special check for closing RM 1.0 sequence with no application message
-        //  need to generate Sequence header for the LastMessage element anyway, in this
case
-        boolean close10 = isLastMessage && RM10Constants.NAMESPACE_URI.equals(rmNamespace)
&& invocationContext != null;
-        
-        if ((isApplicationMessage || close10) && !isPartialResponse) {
+        if ((isApplicationMessage || (isLastMessage && invocationContext != null))
&& !isPartialResponse) {
             if (LOG.isLoggable(Level.FINE)) {
                 LOG.fine("inbound sequence: " + (null == inSeqId ? "null" : inSeqId.getValue()));
             }


Mime
View raw message