cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1511402 - in /cxf/trunk/rt/ws/rm/src/main: java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java resources/schemas/configuration/wsrm-manager-types.xsd
Date Wed, 07 Aug 2013 17:05:29 GMT
Author: ay
Date: Wed Aug  7 17:05:29 2013
New Revision: 1511402

URL: http://svn.apache.org/r1511402
Log:
[CXF-5187] allow a negative value of maxRetries to indicate unbounded retries

Modified:
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
    cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java?rev=1511402&r1=1511401&r2=1511402&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
(original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
Wed Aug  7 17:05:29 2013
@@ -512,7 +512,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;
@@ -528,7 +528,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/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd?rev=1511402&r1=1511401&r2=1511402&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd (original)
+++ cxf/trunk/rt/ws/rm/src/main/resources/schemas/configuration/wsrm-manager-types.xsd Wed
Aug  7 17:05:29 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> 



Mime
View raw message