You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2008/05/15 23:23:54 UTC
svn commit: r656849 - in
/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server:
ack/TxAck.java queue/SimpleAMQQueue.java
transport/ConnectorConfiguration.java
Author: rgodfrey
Date: Thu May 15 14:23:53 2008
New Revision: 656849
URL: http://svn.apache.org/viewvc?rev=656849&view=rev
Log:
Fixed credit restoration, turned off biased write pool by default, removed unused lock from queue
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
Modified: incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java?rev=656849&r1=656848&r2=656849&view=diff
==============================================================================
--- incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java (original)
+++ incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/ack/TxAck.java Thu May 15 14:23:53 2008
@@ -116,6 +116,7 @@
//make persistent changes, i.e. dequeue and decrementReference
for (QueueEntry msg : _unacked.values())
{
+ msg.restoreCredit();
//Message has been ack so discard it. This will dequeue and decrement the reference.
msg.discard(storeContext);
Modified: incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=656849&r1=656848&r2=656849&view=diff
==============================================================================
--- incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Thu May 15 14:23:53 2008
@@ -80,19 +80,6 @@
private final AtomicBoolean _quiesced = new AtomicBoolean(false);
- /**
- * the _enqueueLock is used to control the entry of new messages onto the queue. In normal operation many threads
- * may concurrently enqueue messages. However while certain operations are being carried out (e.g. clearing the
- * queue), it is important to prevent new messages being added to the queue. To obtain this behaviour we use the
- * readLock for shared "enqueue" access and the write lock for the exclusive access.
- */
- // private final ReadWriteLock _enqueueLock = new ReentrantReadWriteLock();
-
-
- private final Lock _subscriberLock = new ReentrantLock();
-
-// private final List<Subscription> _subscriberList = new CopyOnWriteArrayList<Subscription>();
-
private final SubscriptionList _subscriptionList = new SubscriptionList(this);
private final AtomicReference<SubscriptionList.SubscriptionNode> _lastSubscriptionNode = new AtomicReference<SubscriptionList.SubscriptionNode>(_subscriptionList.getHead());
@@ -294,9 +281,6 @@
throw new NullPointerException("subscription argument is null");
}
-
-
-
boolean removed = _subscriptionList.remove(subscription);
Modified: incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java?rev=656849&r1=656848&r2=656849&view=diff
==============================================================================
--- incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java (original)
+++ incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/transport/ConnectorConfiguration.java Thu May 15 14:23:53 2008
@@ -98,7 +98,7 @@
public boolean _multiThreadNIO;
@Configured(path = "advanced.useWriteBiasedPool",
- defaultValue = "true")
+ defaultValue = "false")
public boolean useBiasedWrites;