Author: ritchiem
Date: Wed Mar 25 18:36:47 2009
New Revision: 758395
URL: http://svn.apache.org/viewvc?rev=758395&view=rev
Log:
QPID-1735 : Removed duplicated methods with differing functionality that was
causing FtD to fail. Annoyingly the tests work as they used the method with the
extra functionality.
Commit from 0.5-release : r758382
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java?rev=758395&r1=758394&r2=758395&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
Wed Mar 25 18:36:47 2009
@@ -170,14 +170,15 @@
boolean isDeleted();
boolean acquiredBySubscription();
-
- void setDeliveredToSubscription();
-
+
/**
* Called when this message is delivered to a consumer. (used to implement
the 'immediate' flag functionality).
* And for selector efficiency.
+ *
+ * This is now also used to unload the message if this entry is on a
flowed queue. As a result this method should
+ * only be called after the message has been sent.
*/
- public void setDeliveredToConsumer();
+ void setDeliveredToSubscription();
void release();
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java?rev=758395&r1=758394&r2=758395&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
Wed Mar 25 18:36:47 2009
@@ -158,7 +158,7 @@
return (_flags & DELIVERED_TO_CONSUMER) != 0;
}
- public void setDeliveredToConsumer()
+ public void setDeliveredToSubscription()
{
_flags |= DELIVERED_TO_CONSUMER;
@@ -223,11 +223,6 @@
return (_state instanceof SubscriptionAcquiredState);
}
- public void setDeliveredToSubscription()
- {
- _flags |= DELIVERED_TO_CONSUMER;
- }
-
public void release()
{
_stateUpdater.set(this, AVAILABLE_STATE);
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?rev=758395&r1=758394&r2=758395&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Wed Mar 25 18:36:47 2009
@@ -280,11 +280,6 @@
//To change body of implemented methods use File |
Settings | File Templates.
}
- public void setDeliveredToConsumer()
- {
- //To change body of implemented methods use File |
Settings | File Templates.
- }
-
public void release()
{
//To change body of implemented methods use File |
Settings | File Templates.
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java?rev=758395&r1=758394&r2=758395&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
Wed Mar 25 18:36:47 2009
@@ -21,7 +21,6 @@
package org.apache.qpid.server.queue;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
@@ -33,7 +32,6 @@
public class QueueEntryImplTest extends TestCase
{
- protected static final Logger _log =
Logger.getLogger(QueueEntryImplTest.class);
/** Test the Redelivered state of a QueueEntryImpl */
public void testRedelivered()
@@ -76,7 +74,7 @@
assertFalse("Undelivered Message should not say it is delivered.",
queueEntry.getDeliveredToConsumer());
- queueEntry.setDeliveredToConsumer();
+ queueEntry.setDeliveredToSubscription();
assertTrue("Delivered Message should say it is delivered.",
queueEntry.getDeliveredToConsumer());
@@ -111,7 +109,7 @@
assertFalse("Undelivered Message should not say it is delivered.",
queueEntry.getDeliveredToConsumer());
- queueEntry.setDeliveredToConsumer();
+ queueEntry.setDeliveredToSubscription();
assertTrue("Delivered Message should say it is delivered.",
queueEntry.getDeliveredToConsumer());
@@ -170,9 +168,6 @@
}
}
- _log.info("m.GetExpiration:" + message.getExpiration());
- _log.info("qe.GetExpiration:" +
((QueueEntryImpl)queueEntry).getExpiration());
- _log.info("AfterSleep:" + System.currentTimeMillis());
assertTrue("After a sleep messages should now be expired.",
queueEntry.expired());
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
