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 2014/12/02 18:02:07 UTC
[1/2] qpid-jms git commit: enable test now that broker change has
been applied
Repository: qpid-jms
Updated Branches:
refs/heads/master 1023dfc88 -> 40ad9e8b3
enable test now that broker change has been applied
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/70b1690f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/70b1690f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/70b1690f
Branch: refs/heads/master
Commit: 70b1690f94a0d7b3a5b16a377bf9db39dee3d9ab
Parents: 1023dfc
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Dec 2 10:40:21 2014 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Dec 2 10:40:21 2014 +0000
----------------------------------------------------------------------
.../org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/70b1690f/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
index 93df879..1db4007 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactedConsumerTest.java
@@ -287,7 +287,6 @@ public class JmsTransactedConsumerTest extends AmqpTestSupport {
session.commit();
}
- @Ignore //TODO: enable after fixing commit issue on broker
@Test(timeout=30000)
public void testSessionTransactedCommitWithPriorityReordering() throws Exception {
connection = createAmqpConnection();
---------------------------------------------------------------------
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: change regular MessageConsumer creation to
use the JmsMessageConsumer object
Posted by ro...@apache.org.
change regular MessageConsumer creation to use the JmsMessageConsumer object
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/40ad9e8b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/40ad9e8b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/40ad9e8b
Branch: refs/heads/master
Commit: 40ad9e8b3c353e3d52f67efc63f7ad563676cd4c
Parents: 70b1690
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Dec 2 11:03:36 2014 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Dec 2 11:03:36 2014 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/jms/JmsSession.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/40ad9e8b/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 19763c9..32b3f11 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
@@ -286,12 +286,12 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
* java.lang.String, boolean)
*/
@Override
- public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean NoLocal) throws JMSException {
+ public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal) throws JMSException {
checkClosed();
checkDestination(destination);
messageSelector = checkSelector(messageSelector);
JmsDestination dest = JmsMessageTransformation.transformDestination(connection, destination);
- JmsTopicSubscriber result = new JmsTopicSubscriber(getNextConsumerId(), this, dest, NoLocal, messageSelector);
+ JmsMessageConsumer result = new JmsMessageConsumer(getNextConsumerId(), this, dest, messageSelector, noLocal);
result.init();
return result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org