You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gr...@apache.org on 2011/03/03 02:56:41 UTC
svn commit: r1076493 - in
/qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client:
BasicMessageConsumer.java BasicMessageConsumer_0_10.java
Author: grkvlt
Date: Thu Mar 3 01:56:40 2011
New Revision: 1076493
URL: http://svn.apache.org/viewvc?rev=1076493&view=rev
Log:
QPID-3008: Change QueueBrowser failover test receiveNoWait behaviour
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=1076493&r1=1076492&r2=1076493&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Thu Mar 3 01:56:40 2011
@@ -384,12 +384,16 @@ public abstract class BasicMessageConsum
public Message receive(long l) throws JMSException
{
+ return receive(l, false);
+ }
+ public Message receive(long l, boolean immediate) throws JMSException
+ {
checkPreConditions();
try
{
- acquireReceiving(false);
+ acquireReceiving(immediate);
}
catch (InterruptedException e)
{
@@ -447,52 +451,7 @@ public abstract class BasicMessageConsum
public Message receiveNoWait() throws JMSException
{
- checkPreConditions();
-
- try
- {
- if (!acquireReceiving(true))
- {
- //If we couldn't acquire the receiving thread then return null.
- // This will occur if failing over.
- return null;
- }
- }
- catch (InterruptedException e)
- {
- /*
- * This seems slightly shoddy but should never actually be executed
- * since we told acquireReceiving to return immediately and it shouldn't
- * block on anything.
- */
-
- return null;
- }
-
- _session.startDispatcherIfNecessary();
-
- try
- {
- Object o = getMessageFromQueue(-1);
- final AbstractJMSMessage m = returnMessageOrThrow(o);
- if (m != null)
- {
- preApplicationProcessing(m);
- postDeliver(m);
- }
-
- return m;
- }
- catch (InterruptedException e)
- {
- _logger.warn("Interrupted: " + e);
-
- return null;
- }
- finally
- {
- releaseReceiving();
- }
+ return receive(-1, true);
}
/**
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=1076493&r1=1076492&r2=1076493&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Thu Mar 3 01:56:40 2011
@@ -459,7 +459,7 @@ public class BasicMessageConsumer_0_10 e
Message receiveBrowse() throws JMSException
{
- return receiveNoWait();
+ return receive(-1, false);
}
@Override public void rollbackPendingMessages()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org