Merge pull request #106 from rabbitmq/rabbitmq-java-client-105

michaelklishin · michaelklishin · commit 2b18b17bf4af · 2015-11-20T03:50:14.000+03:00
Fixes #105
diff --git a/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java b/src/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java
@@ -378,7 +378,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
`@@ -378,7 +378,9 @@ public String basicConsume(String queue, boolean autoAck, String consumerTag, bo`
`378`	`378`
`379`	`379`	`public void basicCancel(String consumerTag) throws IOException {`
`380`	`380`	`RecordedConsumer c = this.deleteRecordedConsumer(consumerTag);`
`381`		`- this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());`
	`381`	`+ if(c != null) {`
	`382`	`+ this.maybeDeleteRecordedAutoDeleteQueue(c.getQueue());`
	`383`	`+ }`
`382`	`384`	`delegate.basicCancel(consumerTag);`
`383`	`385`	`}`
`384`	`386`