You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/11 08:52:32 UTC
git commit: CAMEL-7665 Applied the patch with thanks to neoramon
Repository: camel
Updated Branches:
refs/heads/master 4f302f316 -> a5dbf6688
CAMEL-7665 Applied the patch with thanks to neoramon
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5dbf668
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5dbf668
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5dbf668
Branch: refs/heads/master
Commit: a5dbf6688c9ff0fd475990a6ee306860ac170c6c
Parents: 4f302f3
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Sep 11 14:51:17 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Sep 11 14:52:15 2014 +0800
----------------------------------------------------------------------
.../component/rabbitmq/RabbitMQConsumer.java | 38 --------------------
1 file changed, 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a5dbf668/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
index eb3dfde..7bb0bd8 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConsumer.java
@@ -27,7 +27,6 @@ import com.rabbitmq.client.AMQP;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.Envelope;
-import com.rabbitmq.client.ShutdownSignalException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
@@ -208,43 +207,6 @@ public class RabbitMQConsumer extends DefaultConsumer {
}
/**
- * Reject a message without throw exceptions.
- *
- * @param deliveryTagString Message tag to reject.
- */
- protected void rejectQuietly(String deliveryTagString) {
- try {
- long deliveryTag = Long.valueOf(deliveryTagString);
- if (deliveryTag != 0 && !consumer.endpoint.isAutoAck()) {
- channel.basicReject(deliveryTag, false);
- }
- } catch (Exception e) {
- log.error("Fail to reject message [delivery_tag={}]", deliveryTagString);
- }
- }
-
- @Override
- public void handleCancel(String consumerTag) throws IOException {
- rejectQuietly(consumerTag);
- }
-
- @Override
- public void handleCancelOk(String consumerTag) {
- rejectQuietly(consumerTag);
- }
-
- @Override
- public void handleConsumeOk(String consumerTag) {
- rejectQuietly(consumerTag);
- }
-
- @Override
- public void handleShutdownSignal(String consumerTag,
- ShutdownSignalException sig) {
- rejectQuietly(consumerTag);
- }
-
- /**
* Will take an {@link Exchange} and add header values back to the {@link Exchange#getIn()}
*/
private void mergeAmqpProperties(Exchange exchange, AMQP.BasicProperties properties) {