zookeeper 1.2.9-java → 1.2.10-java

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.2.10 minor bug fix in java code
+  
+  * Don't obscure a legitimate exception because of an unexpected nil
+
 v1.2.7 further lock adjustments, deadlock risk reduction
 
   * Refactor ZookeeperBase to not hold onto the mutex while waiting

data/java/java_base.rb

@@ -443,7 +443,7 @@ class JavaBase
     # this is a no-op in java-land
   end
 
-  protected
+  private
     def jzk
       @mutex.synchronize { @jzk }
     end
@@ -451,9 +451,14 @@ class JavaBase
     def handle_keeper_exception
       yield
     rescue JZK::KeeperException => e
-      e.cause.code.intValue
+      if e.respond_to?(:cause) and e.cause and e.cause.respond_to?(:code) and e.cause.code and e.cause.code.respond_to?(:intValue)
+        e.cause.code.intValue
+      else
+        raise e # dunno what happened, just raise it
+      end
     end
 
+
     def call_type(callback, watcher)
       if callback
         watcher ? :async_watch : :async
@@ -481,7 +486,6 @@ class JavaBase
       }
     end
 
-  private
     def replace_jzk!
       orig_jzk = @jzk
       @jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self))

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.2.9'
+  VERSION = '1.2.10'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 2
-  - 9
-  version: 1.2.9
+  - 10
+  version: 1.2.10
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 Z
+date: 2012-07-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports