Author: ay Date: Thu Aug 8 11:56:11 2013 New Revision: 1511718 URL: http://svn.apache.org/r1511718 Log: Merged revisions 1511707 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1511707 | ay | 2013-08-08 13:36:59 +0200 (Thu, 08 Aug 2013) | 9 lines Merged revisions 1511402 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1511402 | ay | 2013-08-07 19:05:29 +0200 (Wed, 07 Aug 2013) | 1 line [CXF-5187] allow a negative value of maxRetries to indicate unbounded retries ........ ........ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd Propchange: cxf/branches/2.6.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java?rev=1511718&r1=1511717&r2=1511718&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java Thu Aug 8 11:56:11 2013 @@ -514,7 +514,7 @@ public class RetransmissionQueueImpl imp nextInterval = baseRetransmissionInterval * backoff; RetryPolicyType rmrp = null != manager.getSourcePolicy() ? manager.getSourcePolicy().getRetryPolicy() : null; - maxRetries = null != rmrp ? rmrp.getMaxRetries() : 0; + maxRetries = null != rmrp ? rmrp.getMaxRetries() : -1; AddressingProperties maps = RMContextUtils.retrieveMAPs(message, false, true); AttributedURIType to = null; @@ -530,7 +530,7 @@ public class RetransmissionQueueImpl imp if (null != rmprops) { number = rmprops.getSequence().getMessageNumber(); } - if (null != manager.getTimer()) { + if (null != manager.getTimer() && maxRetries != 0) { schedule(); } } Modified: cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd?rev=1511718&r1=1511717&r2=1511718&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd (original) +++ cxf/branches/2.6.x-fixes/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd Thu Aug 8 11:56:11 2013 @@ -197,11 +197,11 @@ </xs:complexType> <xs:complexType name="RetryPolicyType"> - <xs:attribute name="maxRetries" type="xs:int" use="optional" default="0"> + <xs:attribute name="maxRetries" type="xs:int" use="optional" default="-1"> <xs:annotation> <xs:documentation> The maximum number of retries of a message. - A value of 0 means the number is unbound. + A negative value means the number is unbound. </xs:documentation> </xs:annotation> </xs:attribute>
