Merge branch 'stable' into 4.0.x-stable

Author: michaelklishin

src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java

@@ -783,8 +783,8 @@ RecordedConsumer deleteRecordedConsumer(String consumerTag) {
     }
 
     void maybeDeleteRecordedAutoDeleteQueue(String queue) {
-        synchronized (this.recordedQueues) {
-            synchronized (this.consumers) {
+        synchronized (this.consumers) {
+            synchronized (this.recordedQueues) {
                 if(!hasMoreConsumersOnQueue(this.consumers.values(), queue)) {
                     RecordedQueue q = this.recordedQueues.get(queue);
                     // last consumer on this connection is gone, remove recorded queue
@@ -798,8 +798,8 @@ void maybeDeleteRecordedAutoDeleteQueue(String queue) {
     }
 
     void maybeDeleteRecordedAutoDeleteExchange(String exchange) {
-        synchronized (this.recordedExchanges) {
-            synchronized (this.consumers) {
+        synchronized (this.consumers) {
+            synchronized (this.recordedExchanges) {
                 if(!hasMoreDestinationsBoundToExchange(Utility.copy(this.recordedBindings), exchange)) {
                     RecordedExchange x = this.recordedExchanges.get(exchange);
                     // last binding where this exchange is the source is gone, remove recorded exchange