Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 4087 invoked from network); 9 Sep 2009 13:03:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Sep 2009 13:03:26 -0000 Received: (qmail 3525 invoked by uid 500); 9 Sep 2009 13:03:26 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 3468 invoked by uid 500); 9 Sep 2009 13:03:26 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 3459 invoked by uid 99); 9 Sep 2009 13:03:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2009 13:03:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2009 13:03:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E8CB82388893; Wed, 9 Sep 2009 13:03:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r812932 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java Date: Wed, 09 Sep 2009 13:03:03 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090909130303.E8CB82388893@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Wed Sep 9 13:03:03 2009 New Revision: 812932 URL: http://svn.apache.org/viewvc?rev=812932&view=rev Log: Fix for https://issues.apache.org/activemq/browse/AMQ-910 Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java?rev=812932&r1=812931&r2=812932&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/RedeliveryPolicy.java Wed Sep 9 13:03:03 2009 @@ -37,7 +37,7 @@ private long initialRedeliveryDelay = 1000L; private boolean useCollisionAvoidance; private boolean useExponentialBackOff; - private short backOffMultiplier = 5; + private double backOffMultiplier = 5.0; public RedeliveryPolicy() { } @@ -50,11 +50,11 @@ } } - public short getBackOffMultiplier() { + public double getBackOffMultiplier() { return backOffMultiplier; } - public void setBackOffMultiplier(short backOffMultiplier) { + public void setBackOffMultiplier(double backOffMultiplier) { this.backOffMultiplier = backOffMultiplier; } @@ -88,7 +88,7 @@ if (previousDelay == 0) { redeliveryDelay = initialRedeliveryDelay; } else if (useExponentialBackOff && backOffMultiplier > 1) { - redeliveryDelay = previousDelay * backOffMultiplier; + redeliveryDelay = (long) (previousDelay * backOffMultiplier); } else { redeliveryDelay = previousDelay; }