diff options
Diffstat (limited to 'java/client')
3 files changed, 8 insertions, 9 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 8984b7ca8c..4b6015945e 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -1583,6 +1583,11 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic return _prefetchLowMark; } + public int getPrefetch() + { + return _prefetchHighMark; + } + public AMQShortString getDefaultQueueExchangeName() { return _connection.getDefaultQueueExchangeName(); @@ -3047,7 +3052,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic */ public boolean prefetch() { - return getAMQConnection().getMaxPrefetch() > 0; + return _prefetchHighMark > 0; } /** Signifies that the session has pending sends to commit. */ diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java index a49e31ce8c..3b6179dd07 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java +++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java @@ -545,7 +545,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<UnprocessedM } else if (getSession().prefetch()) { - capacity = _0_10session.getAMQConnection().getMaxPrefetch(); + capacity = getSession().getPrefetch(); } return capacity; } diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java b/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java index f53fa8d83c..1889577773 100644 --- a/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java +++ b/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java @@ -588,7 +588,7 @@ public class AMQSession_0_10Test extends TestCase } boolean isTransacted = acknowledgeMode == javax.jms.Session.SESSION_TRANSACTED ? true : false; AMQSession_0_10 session = new AMQSession_0_10(createConnection(throwException), amqConnection, 1, isTransacted, acknowledgeMode, - 1, 1, "test"); + 0, 0, "test"); return session; } @@ -600,7 +600,6 @@ public class AMQSession_0_10Test extends TestCase connection.setSessionFactory(new SessionFactory() { - @Override public Session newSession(Connection conn, Binary name, long expiry) { return new MockSession(conn, new SessionDelegate(), name, expiry, throwException); @@ -611,7 +610,6 @@ public class AMQSession_0_10Test extends TestCase private final class MockMessageListener implements MessageListener { - @Override public void onMessage(Message arg0) { } @@ -710,23 +708,19 @@ public class AMQSession_0_10Test extends TestCase { private List<ProtocolEvent> _sendEvents = new ArrayList<ProtocolEvent>(); - @Override public void setIdleTimeout(int i) { } - @Override public void send(ProtocolEvent msg) { _sendEvents.add(msg); } - @Override public void flush() { } - @Override public void close() { } |