Update consumer tags on connection recovery

acogoluegnes · acogoluegnes · commit 0cfbbca1aece · 2016-10-24T13:28:09.000+02:00
References rabbitmq#208
diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
@@ -720,4 +720,11 @@ private void maybeDeleteRecordedAutoDeleteQueue(String queue) {
     private void maybeDeleteRecordedAutoDeleteExchange(String exchange) {
         this.connection.maybeDeleteRecordedAutoDeleteExchange(exchange);
     }
+
+    public void updateConsumerTag(String tag, String newTag) {
+        synchronized (this.consumerTags) {
+            consumerTags.remove(tag);
+            consumerTags.add(newTag);
+        }
+    }
 }
diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
@@ -645,10 +645,14 @@ private void recoverConsumers() {
             try {
                 String newTag = consumer.recover();
                 // make sure server-generated tags are re-added. MK.
-                synchronized (this.consumers) {
-                    this.consumers.remove(tag);
-                    this.consumers.put(newTag, consumer);
+                if(tag != null && !tag.equals(newTag)) {
+                    synchronized (this.consumers) {
+                        this.consumers.remove(tag);
+                        this.consumers.put(newTag, consumer);
+                    }
+                    consumer.getChannel().updateConsumerTag(tag, newTag);
                 }
+
                 for(ConsumerRecoveryListener crl : Utility.copy(this.consumerRecoveryListeners)) {
                     crl.consumerRecovered(tag, newTag);
                 }

Original file line number	Diff line number	Diff line change
`@@ -720,4 +720,11 @@ private void maybeDeleteRecordedAutoDeleteQueue(String queue) {`
`720`	`720`	`private void maybeDeleteRecordedAutoDeleteExchange(String exchange) {`
`721`	`721`	`this.connection.maybeDeleteRecordedAutoDeleteExchange(exchange);`
`722`	`722`	`}`
	`723`	`+`
	`724`	`+ public void updateConsumerTag(String tag, String newTag) {`
	`725`	`+ synchronized (this.consumerTags) {`
	`726`	`+ consumerTags.remove(tag);`
	`727`	`+ consumerTags.add(newTag);`
	`728`	`+ }`
	`729`	`+ }`
`723`	`730`	`}`