march_hare 2.1.0-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232bb0574ab204c555ec5796175f89c781a0bb42
-  data.tar.gz: b7a3f0bba1844a25b1ddaa52f90b8a209f462d79
+  metadata.gz: 76a2144c66b2cea99bfa99d1cc6afac89687fc15
+  data.tar.gz: 18b91f31822ba762d3bb6d61d8ac0fedfd91f8c7
 SHA512:
-  metadata.gz: 703d44fcd794f31ba173842984804ec45cd1ec1ef958e51608e3d7e5d7d8ca4d63dcb6de3ed6542d7d01d343543b5162fa10f084abac689a0e293cdf7500ed92
-  data.tar.gz: b0bceb666187ffb2843a0386f3060ce0ac47d8d48ef07eddfbb0beaaffecc4f51b3daae8f401774be47735e248aec4f8d3aed4c05df272270fe67c45724a6451
+  metadata.gz: 9446f20aa6f7a98a3554feceb53e04d6e52eb138bf3e270fe432b5e1cbb9b23d4cf9f728948620800ec4d7a0061e0c5f6e54eb658156e1a6102e3769e1f8e13c
+  data.tar.gz: 1ab98f4acb979876a8033c956b17e4ecb1150df82c465fc30e26ce68c7e0b46aebd651d306cbad335128010b961e0a7cab3c0ebcafad716ac65ffd7da6685b04

data/lib/march_hare/session.rb

@@ -79,7 +79,7 @@ module MarchHare
       # executors cannot be restarted after shutdown,
       # so we really need a factory here. MK.
       @executor_factory = opts[:executor_factory] || build_executor_factory_from(opts)
-      @connection       = self.new_connection
+      @connection       = self.new_connection_impl
       @channels         = JavaConcurrent::ConcurrentHashMap.new
 
       # should automatic recovery from network failures be used?
@@ -127,6 +127,7 @@ module MarchHare
         ch.close
       end
 
+      maybe_shut_down_executor
       @connection.close
     end
 
@@ -194,7 +195,7 @@ module MarchHare
 
       @connection = converting_rjc_exceptions_to_ruby do
         reconnecting_on_network_failures(ms) do
-          self.new_connection
+          self.new_connection_impl
         end
       end
       @thread_pool = ThreadPools.dynamically_growing
@@ -377,16 +378,22 @@ module MarchHare
     end
 
     # @private
-    def new_connection
+    def new_connection_impl
       converting_rjc_exceptions_to_ruby do
         if @executor_factory
-          @cf.new_connection(@executor_factory.call)
+          @executor = @executor_factory.call
+          @cf.new_connection(@executor)
         else
           @cf.new_connection
         end
       end
     end
 
+    # @private
+    def maybe_shut_down_executor
+      @executor.shutdown if @executor
+    end
+
     # Makes it easier to construct executor factories.
     # @private
     def build_executor_factory_from(opts)

data/lib/march_hare/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-30 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.1.9
+rubygems_version: 2.2.1
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client