You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/08/26 13:25:35 UTC
[1/2] qpid-jms git commit: QPIDJMS-98: add some additional logging to
get a better view on behaviour during test failure
Repository: qpid-jms
Updated Branches:
refs/heads/master 894dce5c4 -> 62fba39e7
QPIDJMS-98: add some additional logging to get a better view on behaviour during test failure
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/62fba39e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/62fba39e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/62fba39e
Branch: refs/heads/master
Commit: 62fba39e77b6c575c7ead755ed13faba2f0c3d8b
Parents: 6db1635
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Aug 26 12:23:45 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Aug 26 12:24:55 2015 +0100
----------------------------------------------------------------------
.../JmsTransactionRedeliveryPolicyTest.java | 39 +++++++++++++-------
1 file changed, 26 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/62fba39e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java
index c5089f2..d647d12 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java
@@ -136,19 +136,7 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport {
assertEquals(MSG_COUNT, queueView.getQueueSize());
final CountDownLatch done = new CountDownLatch(MSG_COUNT);
- consumer.setMessageListener(new MessageListener() {
-
- @Override
- public void onMessage(Message message) {
- try {
- assertTrue(message.getJMSRedelivered());
- assertTrue(message instanceof TextMessage);
-
- done.countDown();
- } catch (JMSException e) {
- }
- }
- });
+ consumer.setMessageListener(new MaxRedeliveryListener(done, i));
assertTrue("Not All Messages Received", done.await(10, TimeUnit.SECONDS));
assertEquals(MSG_COUNT, queueView.getQueueSize());
@@ -173,4 +161,29 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport {
session.commit();
}
+
+ private static class MaxRedeliveryListener implements MessageListener {
+ private final CountDownLatch done;
+ private final int listenerNumber;
+
+ private MaxRedeliveryListener(CountDownLatch done, int listenerNumber) {
+ this.done = done;
+ this.listenerNumber = listenerNumber;
+ }
+
+ @Override
+ public void onMessage(Message message) {
+ try {
+ assertTrue(message.getJMSRedelivered());
+ assertTrue(message instanceof TextMessage);
+
+ LOG.debug("Listener {} received message: {}", listenerNumber, message.getIntProperty(AmqpTestSupport.MESSAGE_NUMBER));
+
+ done.countDown();
+ } catch (JMSException e) {
+ LOG.error("Caught exception in listener {}", listenerNumber, e);
+ }
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: NO-JIRA: add some notes for later
Posted by ro...@apache.org.
NO-JIRA: add some notes for later
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6db16354
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6db16354
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6db16354
Branch: refs/heads/master
Commit: 6db16354b5c43b503cf9dfe7fc3a9cf4c8d0e767
Parents: 894dce5
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Aug 26 12:17:27 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Aug 26 12:24:55 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/jms/JmsConnection.java | 1 +
qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6db16354/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index 6873fee..3367212 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -1008,6 +1008,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
// Run the application callbacks on the connection executor to allow the provider to
// return to its normal processing without waiting for client level processing to finish.
+ //TODO: if this is usually empty, optimise this a little by skipping iteration?
for (final JmsConnectionListener listener : connectionListeners) {
executor.submit(new Runnable() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6db16354/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
index 19d86e5..8b75287 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
@@ -949,6 +949,8 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
@Override
public void onInboundMessage(JmsInboundMessageDispatch envelope) {
+ // TODO: is onInboundMessage ever called on the Session?
+ // Seems like we might only call it on consumers from within the connection.
if (started.get()) {
deliver(envelope);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org