AutorecoveringConnection: clean up bindings of deleted exchanges

so that they (the bindings) do not reappear after
connection recovery.

Noticed while working on ruby-amqp/bunny#704.

(cherry picked from commit aaff1cc)

Author: michaelklishin

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

@@ -1094,8 +1094,12 @@ void recordExchange(String exchange, RecordedExchange x) {
 
     void deleteRecordedExchange(String exchange) {
         this.recordedExchanges.remove(exchange);
-        Set<RecordedBinding> xs = this.removeBindingsWithDestination(exchange);
-        for (RecordedBinding b : xs) {
+        Set<RecordedBinding> xs1 = this.removeBindingsWithDestination(exchange);
+        for (RecordedBinding b : xs1) {
+            this.maybeDeleteRecordedAutoDeleteExchange(b.getSource());
+        }
+        Set<RecordedBinding> xs2 = this.removeBindingsWithSource(exchange);
+        for (RecordedBinding b : xs2) {
             this.maybeDeleteRecordedAutoDeleteExchange(b.getSource());
         }
     }
@@ -1172,6 +1176,20 @@ Set<RecordedBinding> removeBindingsWithDestination(String s) {
         return result;
     }
 
+    Set<RecordedBinding> removeBindingsWithSource(String s) {
+        final Set<RecordedBinding> result = new LinkedHashSet<>();
+        synchronized (this.recordedBindings) {
+            for (Iterator<RecordedBinding> it = this.recordedBindings.iterator(); it.hasNext(); ) {
+                RecordedBinding b = it.next();
+                if (b.getSource().equals(s)) {
+                    it.remove();
+                    result.add(b);
+                }
+            }
+        }
+        return result;
+    }
+
     public Map<String, RecordedQueue> getRecordedQueues() {
         return recordedQueues;
     }