Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8949a83 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8949a83 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8949a83 Branch: refs/heads/master Commit: a8949a83f5d4abb53105b016bf7a88ad63401d6a Parents: e82caec Author: Claus Ibsen <davscl...@apache.org> Authored: Wed May 6 11:53:28 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed May 6 12:01:58 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/jms/JmsConfiguration.java | 4 ---- .../java/org/apache/camel/component/jms/JmsPollingConsumer.java | 1 - .../org/apache/camel/component/jms/issues/JmsHammerTest.java | 3 +-- 3 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a8949a83/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java index 58a290c..e372293 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java @@ -1133,10 +1133,6 @@ public class JmsConfiguration implements Cloneable { listener.setReplyToDestination(getReplyTo()); } - // TODO: REVISIT: We really ought to change the model and let JmsProducer - // and JmsConsumer have their own JmsConfiguration instance - // This way producer's and consumer's QoS can differ and be - // independently configured JmsOperations operations = listener.getTemplate(); if (operations instanceof JmsTemplate) { JmsTemplate template = (JmsTemplate) operations; http://git-wip-us.apache.org/repos/asf/camel/blob/a8949a83/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java index cbb74b0..1ad9cdc 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java @@ -56,7 +56,6 @@ public class JmsPollingConsumer extends PollingConsumerSupport implements Servic } public Exchange receive(long timeout) { - // TODO: use api so we can get hold of session setReceiveTimeout(timeout); Message message; // using the selector http://git-wip-us.apache.org/repos/asf/camel/blob/a8949a83/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java index 36a0d72..07076b3 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java @@ -53,8 +53,7 @@ public class JmsHammerTest extends CamelTestSupport { protected CamelContext createCamelContext() throws Exception { CamelContext camelContext = super.createCamelContext(); - // TODO: MR-170 - ActiveMQComponent activemq = + ActiveMQComponent activemq = activeMQComponent("vm://localhost?broker.persistent=false&broker.useJmx=false&jms.redeliveryPolicy.maximumRedeliveries=0" + "&jms.redeliveryPolicy.initialRedeliveryDelay=500&jms.useAsyncSend=false&jms.sendTimeout=10000" + "&jms.maxReconnectAttempts=1&jms.timeout=3000");
