hydra 0.16.3 → 0.16.4

data/VERSION

@@ -1 +1 @@
-0.16.3
+0.16.4

data/hydra.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.16.3"
+  s.version = "0.16.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]

data/lib/hydra/safe_fork.rb

@@ -8,7 +8,7 @@ class SafeFork
         begin
           # create a new connection and perform the action
           begin
-          ActiveRecord::Base.establish_connection(connection.merge({:allow_concurrency => true})) if defined?(ActiveRecord)
+          ActiveRecord::Base.establish_connection((connection || {}).merge({:allow_concurrency => true})) if defined?(ActiveRecord)
           rescue ActiveRecord::AdapterNotSpecified
             # AR was defined but we didn't have a connection
           end
@@ -21,7 +21,7 @@ class SafeFork
     ensure
       # make sure we re-establish the connection before returning to the main instance
       begin
-        ActiveRecord::Base.establish_connection(connection.merge({:allow_concurrency => true})) if defined?(ActiveRecord)
+        ActiveRecord::Base.establish_connection((connection || {}).merge({:allow_concurrency => true})) if defined?(ActiveRecord)
       rescue ActiveRecord::AdapterNotSpecified
         # AR was defined but we didn't have a connection
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 16
-  - 3
-  version: 0.16.3
+  - 4
+  version: 0.16.4
 platform: ruby
 authors: 
 - Nick Gauthier