Merge branch 'stable'

michaelklishin · michaelklishin · commit e40275e1169d · 2015-11-20T03:51:16.000+03:00
diff --git a/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java b/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
@@ -386,7 +386,9 @@ public String basicConsume(String queue, boolean autoAck, String consumerTag, bo
 
     public void basicCancel(String consumerTag) throws IOException {
         RecordedConsumer c = this.deleteRecordedConsumer(consumerTag);
-        this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());
+        if(c != null) {
+            this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());
+        }
         delegate.basicCancel(consumerTag);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,9 @@ public String basicConsume(String queue, boolean autoAck, String consumerTag, bo`
`386`	`386`
`387`	`387`	`public void basicCancel(String consumerTag) throws IOException {`
`388`	`388`	`RecordedConsumer c = this.deleteRecordedConsumer(consumerTag);`
`389`		`- this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());`
	`389`	`+ if(c != null) {`
	`390`	`+ this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());`
	`391`	`+ }`
`390`	`392`	`delegate.basicCancel(consumerTag);`
`391`	`393`	`}`
`392`	`394`