You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/03/25 16:10:21 UTC
svn commit: r1460709 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
Author: ivank
Date: Mon Mar 25 15:10:21 2013
New Revision: 1460709
URL: http://svn.apache.org/r1460709
Log:
BOOKKEEPER-586: Remove recursive call in delivery manager (sijie via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1460709&r1=1460708&r2=1460709&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Mon Mar 25 15:10:21 2013
@@ -12,6 +12,8 @@ Trunk (unreleased changes)
BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)
+ BOOKKEEPER-586: Remove recursive call in delivery manager (sijie via ivank)
+
bookkeeper-server:
BOOKKEEPER-567: ReadOnlyBookieTest hangs on shutdown (sijie via ivank)
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java?rev=1460709&r1=1460708&r2=1460709&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java Mon Mar 25 15:10:21 2013
@@ -127,7 +127,7 @@ public class FIFODeliveryManager impleme
private final Thread workerThread;
private final int idx;
- private Object suspensionLock = new Object();
+ private final Object suspensionLock = new Object();
private boolean suspended = false;
DeliveryWorker(int index) {
@@ -208,7 +208,6 @@ public class FIFODeliveryManager impleme
if (!retryQueue.offer(subscriber)) {
throw new UnexpectedError("Could not enqueue to retry queue for delivery worker " + idx);
}
- getDeliveryWorker(subscriber.getTopic()).retryErroredSubscriberAfterDelay(subscriber);
}
public void clearRetryDelayForSubscriber(ActiveSubscriberState subscriber) {