march_hare 2.1.2-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c275fc15d1a7b00ec3dc6f34a5ef50a1b0046395
-  data.tar.gz: 233e98ccc0ae76bda34f5b626f8a0aa231944ef7
+  metadata.gz: 0cfa81d0644a594e7da4535491254eefdb3af17a
+  data.tar.gz: ff8c1b3ffc772a9af93e90fdbff4796a8b7730bc
 SHA512:
-  metadata.gz: ed4664238f267016c446d8dad3f09cb45188a474a4522e3f2dc013244192ca4ba2ab331a0421a201dd37a9a10c86a85dd9e08bed1d25d3debaa1a396d0aafaac
-  data.tar.gz: e8f4c63cf7be9d79e19dbbde04ae16169f925d918fda728d5277148a326e58b13a83f12d1cf1b08dcf00cf9ee604b16d121e8763c9a1c1109704b2c5db206feb
+  metadata.gz: 6129f2ede1f5b492981a69f6af483cb59c5790f259a81d92350310bc079be048746ee0fcad9f78fe3e8ff7324eed33535affde0637633408f6587b4feac35736
+  data.tar.gz: d9d0b3482b407fca75a39598a199d3944d966e67ff6d59c2a66386a6a6033cb150bc68cb0b5e6c8e873db3791d4d646064783675b78f466ca3f0c5fa061016ce

data/lib/march_hare/channel.rb

@@ -129,6 +129,7 @@ module MarchHare
       # from having to worry about this. MK.
       @consumers      = JavaConcurrent::ConcurrentHashMap.new
       @shutdown_hooks = Array.new
+      @confirm_hooks  = Array.new
       @recoveries_counter = JavaConcurrent::AtomicInteger.new(0)
 
       on_shutdown do |ch, cause|
@@ -188,6 +189,7 @@ module MarchHare
 
       self.recover_prefetch_setting
       self.recover_confirm_mode
+      self.recover_confirm_hooks
       self.recover_tx_mode
       self.recover_exchanges
       # # this includes bindings recovery
@@ -208,6 +210,13 @@ module MarchHare
       end
     end
 
+    # @private
+    def recover_confirm_hooks
+      @confirm_hooks.each do |ch|
+        @delegate.add_confirm_listener(ch)
+      end
+    end
+
     # Recovers basic.qos setting. Used by the Automatic Network Failure
     # Recovery feature.
     #
@@ -836,14 +845,6 @@ module MarchHare
       end
     end
 
-    # Enables or disables channel flow. This feature id deprecated
-    # in RabbitMQ.
-    def channel_flow(active)
-      converting_rjc_exceptions_to_ruby do
-        @delegate.channel_flow(active)
-      end
-    end
-
     # Defines a returned message handler.
     # @see http://rubymarchhare.info/articles/exchanges.html Exchanges and Publishers guide
     def on_return(&block)
@@ -853,7 +854,9 @@ module MarchHare
     # Defines a publisher confirm handler
     # @see http://rubymarchhare.info/articles/exchanges.html Exchanges and Publishers guide
     def on_confirm(&block)
-      self.add_confirm_listener(BlockConfirmListener.from(block))
+      ch = BlockConfirmListener.from(block)
+      self.add_confirm_listener(ch)
+      @confirm_hooks << ch
     end
 
     def method_missing(selector, *args)

data/lib/march_hare/exceptions.rb

@@ -97,20 +97,20 @@ module MarchHare
   class Exceptions
     def self.convert(e, unwrap_io_exception = true)
       case e
+      when java.net.SocketException then
+        IOError.new
       when java.io.IOException then
         c = e.cause
 
-        if unwrap_io_exception
+        if c && unwrap_io_exception
           convert(c, false)
         else
-          c
+          IOError.new
         end
       when com.rabbitmq.client.AlreadyClosedException then
         ChannelAlreadyClosed.new(e.reason)
       when com.rabbitmq.client.ShutdownSignalException then
-        cmd = e.reason
-
-        exception_for_protocol_method(cmd.method)
+        exception_for_protocol_method(e.reason)
       else
         e
       end

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: march_hare
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client