march_hare 2.0.0.rc1-java → 2.0.0.rc2-java

data/lib/march_hare/consumers/base.rb

@@ -108,7 +108,14 @@ module MarchHare
     end
 
     def cancel
-      @channel.basic_cancel(consumer_tag)
+      if @cancelling.get_and_set(true)
+        false
+      else
+        @channel.basic_cancel(@consumer_tag)
+        @cancelled.set(true)
+        @terminated.set(true)
+        true
+      end
     end
   end
 end

data/lib/march_hare/consumers/blocking.rb

@@ -14,14 +14,9 @@ module MarchHare
     end
 
     def cancel
-      @cancelling.set(true)
-      response = channel.basic_cancel(consumer_tag)
-      @cancelled.set(true)
-
-      @internal_queue.offer(POISON)
-      @terminated.set(true)
-
-      response
+      if super
+        @internal_queue.offer(POISON)
+      end
     end
 
     def start

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
   prerelease: 6
 platform: java
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email: