Author: rgodfrey
Date: Thu May 29 09:47:50 2008
New Revision: 661395
URL: http://svn.apache.org/viewvc?rev=661395&view=rev
Log:
Comments and changes from review
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.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/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
Modified:
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java?rev=661395&r1=661394&r2=661395&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
Thu May 29 09:47:50 2008
@@ -196,6 +196,8 @@
}
else
{
+ // TODO
+
int offset;
final int queueCount = destinationQueues.size();
if(queueCount == 1)
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=661395&r1=661394&r2=661395&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 29 09:47:50 2008
@@ -461,8 +461,7 @@
try
{
if(subscriptionReadyAndHasInterest(sub, entry)
- && !sub.isSuspended()
- && sub.isActive())
+ && !sub.isSuspended())
{
if( !sub.wouldSuspend(entry))
{
@@ -474,13 +473,6 @@
}
else
{
- // Update the last seen marker for this subscription,
if some other process hasn't already
- // updated it
- QueueEntry queueEntryNode = sub.getLastSeenEntry();
- if(_entries.next(queueEntryNode) == entry)
- {
- sub.setLastSeenEntry(queueEntryNode,entry);
- }
deliverMessage(sub, entry);
@@ -552,7 +544,8 @@
{
// Otherwise we should try to update the subscription's last seen
entry to the entry we got to, providing
// no-one else has updated it to something furhter on in the list
- updateLastSeenEntry(sub, entry);
+ //TODO - check
+ //updateLastSeenEntry(sub, entry);
return false;
}
@@ -1385,7 +1378,7 @@
while(deliveries != 0 && ((previousStateChangeCount !=
(stateChangeCount = _stateChangeCount.get())) || deliveryIncomplete ) &&
_asynchronousRunner.compareAndSet(null,runner))
{
- // we want to have one extra loop after the every subscription has
reached the point where it cannot move
+ // we want to have one extra loop after every subscription has
reached the point where it cannot move
// further, just in case the advance of one subscription in the
last loop allows a different subscription to
// move forward in the next iteration
Modified:
incubator/qpid/branches/broker-queue-refactor/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/broker-queue-refactor/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java?rev=661395&r1=661394&r2=661395&view=diff
==============================================================================
---
incubator/qpid/branches/broker-queue-refactor/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
(original)
+++
incubator/qpid/branches/broker-queue-refactor/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
Thu May 29 09:47:50 2008
@@ -215,23 +215,26 @@
{
_logger.info("Performing Receive only with two consumers on one
session ");
- MessageConsumer consumer2 = _clientSession1.createConsumer(_queue);
- for (int msg = 0; msg < (MSG_COUNT / 2); msg++)
+ int msg;
+ for (msg = 0; msg < (MSG_COUNT / 2); msg++)
{
- final Message message = _consumer1.receive(100000);
+ final Message message = _consumer1.receive(1000);
if(message == null)
{
- System.out.println("!!!!!!!! " + msg);
+ break;
}
- assertTrue(message != null);
+
}
- for (int msg = 0; msg < (MSG_COUNT / 2); msg++)
+ _consumer1.close();
+ _clientSession1.close();
+
+ for (; msg < MSG_COUNT ; msg++)
{
- assertTrue(consumer2.receive(10000) != null);
+ assertTrue("Failed at msg id" + msg, _consumer2.receive(1000)
!= null);
}
}
else
