You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/03/22 18:06:03 UTC
svn commit: r1303892 - in /cxf/branches/2.4.x-fixes: ./
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/
systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/
Author: ay
Date: Thu Mar 22 17:06:02 2012
New Revision: 1303892
URL: http://svn.apache.org/viewvc?rev=1303892&view=rev
Log:
Merged revisions 1303345 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1303345 | ay | 2012-03-21 11:23:02 +0100 (Wed, 21 Mar 2012) | 9 lines
Merged revisions 1303342 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1303342 | ay | 2012-03-21 11:16:52 +0100 (Wed, 21 Mar 2012) | 1 line
adding another fix and test to CXF-4188
........
........
Added:
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java
- copied unchanged from r1303345, cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java
cxf/branches/2.4.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-atmostonce-server.xml
- copied unchanged from r1303345, cxf/branches/2.5.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-atmostonce-server.xml
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java?rev=1303892&r1=1303891&r2=1303892&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java Thu Mar 22 17:06:02 2012
@@ -203,6 +203,17 @@ public class Destination extends Abstrac
}
}
+ void releaseDeliveringStatus(Message message) {
+ RMProperties rmps = RMContextUtils.retrieveRMProperties(message, false);
+ SequenceType sequenceType = rmps.getSequence();
+ if (null != sequenceType) {
+ DestinationSequence seq = getSequence(sequenceType.getIdentifier());
+ if (null != seq) {
+ seq.removeDeliveringMessageNumber(sequenceType.getMessageNumber());
+ }
+ }
+ }
+
private static Message createMessage(Exchange exchange) {
Endpoint ep = exchange.get(Endpoint.class);
Message msg = null;
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java?rev=1303892&r1=1303891&r2=1303892&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java Thu Mar 22 17:06:02 2012
@@ -241,7 +241,7 @@ public class DestinationSequence extends
}
if (robust && !robustDelivering) {
// no check performed if in robust and not in delivering
- deliveringMessageNumbers.remove(mn);
+ removeDeliveringMessageNumber(mn);
return true;
}
if (cont != null && da.isSetInOrder() && !cont.isNew()) {
@@ -266,6 +266,10 @@ public class DestinationSequence extends
return true;
}
+ void removeDeliveringMessageNumber(long mn) {
+ deliveringMessageNumbers.remove(mn);
+ }
+
private Continuation getContinuation(Message message) {
if (message == null) {
return null;
Modified: cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java?rev=1303892&r1=1303891&r2=1303892&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java Thu Mar 22 17:06:02 2012
@@ -45,6 +45,11 @@ public class RMInInterceptor extends Abs
@Override
public void handleFault(Message message) {
message.put(MAPAggregator.class.getName(), true);
+ if (MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
+ // revert the delivering entry from the destination sequence
+ Destination destination = getManager().getDestination(message);
+ destination.releaseDeliveringStatus(message);
+ }
}
protected void handle(Message message) throws SequenceFault, RMException {