From 74e6c05d7785be79c93722a879f84fd5d843ebc1 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 27 Aug 2010 13:25:03 -0400
Subject: [PATCH] AMQP-57 updated Rabbit client version from 1.8.1 to 2.0.0.
 This required one change in RabbitTemplate due to a change in the
 Channel.basicConsume() method we were using

---
 spring-amqp-parent/pom.xml                                      | 2 +-
 .../org/springframework/amqp/rabbit/core/RabbitTemplate.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index deeeecc2..1ac1d022 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -19,7 +19,7 @@
 		<org.slf4j.version>1.5.10</org.slf4j.version>
 		<org.codehaus.jackson.version>1.4.3</org.codehaus.jackson.version>
 		<org.erlang.otp.version>1.5.3</org.erlang.otp.version>
-		<com.rabbitmq.version>1.8.1</com.rabbitmq.version>
+		<com.rabbitmq.version>2.0.0</com.rabbitmq.version>
 		<org.springframework.version>3.0.3.RELEASE</org.springframework.version>
 	</properties>
 	<profiles>
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index cd9c5c26..da6404c3 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -301,7 +301,7 @@ public class RabbitTemplate extends RabbitAccessor implements RabbitOperations {
 						}
 					}
 				};
-				channel.basicConsume(replyToAddress.getRoutingKey(), noAck, consumerTag, noLocal, exclusive, consumer);
+				channel.basicConsume(replyToAddress.getRoutingKey(), noAck, consumerTag, noLocal, exclusive, null, consumer);
 				// TODO: get exchange and routing key from method args
 				//       methods that are higher in the stack can determine whether to fallback to template properties
 				doSend(channel, exchange, routingKey, message);