zookeeper 1.2.11-java → 1.2.12-java

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.2.12 improve locking in dispatch_next_callback
+
+  * Possible fix for an edgy NoMethodError on nil
+
 v1.2.11 remove dependency on backports gem
 
   * Somewhat naively we were requiring the backports gem to provide

data/Gemfile

@@ -21,9 +21,8 @@ platform :mri_19 do
 end
 
 group :docs do
-  gem 'yard', '~> 0.8.0'
-
   platform :mri_19 do
+    gem 'yard', '~> 0.8.0'
     gem 'redcarpet'
   end
 end

data/lib/zookeeper/common.rb

@@ -118,14 +118,30 @@ private
     hash[:stat] = Zookeeper::Stat.new(hash[:stat]) if hash.has_key?(:stat)
     hash[:acl] = hash[:acl].map { |acl| Zookeeper::ACLs::ACL.new(acl) } if hash[:acl]
     
-    callback_context = is_completion ? get_completion(hash[:req_id]) : get_watcher(hash[:req_id])
-
-    # When connectivity to the server has been lost (as indicated by SESSION_EVENT)
-    # we want to rerun the callback at a later time when we eventually do have
-    # a valid response.
-    if hash[:type] == Zookeeper::Constants::ZOO_SESSION_EVENT
-      # XXX: setup_completion changed arity, is this setup_completion necessary anymore?
-      is_completion ? setup_completion(hash[:req_id], callback_context) : setup_watcher(hash[:req_id], callback_context)
+    callback_context = nil
+
+    @mutex.synchronize do
+      callback_context = is_completion ? get_completion(hash[:req_id]) : get_watcher(hash[:req_id])
+
+      # When connectivity to the server has been lost (as indicated by SESSION_EVENT)
+      # we want to rerun the callback at a later time when we eventually do have
+      # a valid response.
+      #
+      # XXX: this code needs to be refactored, get_completion shouldn't remove the context
+      #      in the case of a session event. this would involve changing the
+      #      platform implementations as well, as the C version does some funky
+      #      stuff to maintain compatibilty w/ java in chrooted envs.
+      #
+      #      The point is that this lock ^^ is unnecessary if the functions above lock internally
+      #      and don't do the wrong thing, requiring us to do the below.
+      #
+      if hash[:type] == Zookeeper::Constants::ZOO_SESSION_EVENT
+        if is_completion 
+          setup_completion(hash[:req_id], callback_context) 
+        else
+          setup_watcher(hash[:req_id], callback_context)
+        end
+      end
     end
 
     if callback_context

data/lib/zookeeper/exceptions.rb

@@ -9,9 +9,9 @@ module Exceptions
       CONST_MISSING_WARNING = <<-EOS
 
 ------------------------------------------------------------------------------------------
-WARNING! THE ZOOKEEPER NAMESPACE HAS CHNAGED AS OF 1.0!
+WARNING! THE ZOOKEEPER NAMESPACE HAS CHANGED AS OF 1.0!
 
-Please update your code to use the new heirarchy!
+Please update your code to use the new hierarchy!
 
 The constant that got you this was ZookeeperExceptions::ZookeeperException::%s
 

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.2.11'
+  VERSION = '1.2.12'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 2
-  - 11
-  version: 1.2.11
+  - 12
+  version: 1.2.12
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: logging
@@ -209,4 +209,3 @@ test_files:
 - spec/support/progress_formatter.rb
 - spec/support/zookeeper_spec_helpers.rb
 - spec/zookeeper_spec.rb
-has_rdoc: