slyphon-zookeeper 0.2.10 → 0.2.11

data/Manifest

@@ -1,13 +1,11 @@
 CHANGELOG
-Gemfile
 LICENSE
 Manifest
 README
 Rakefile
-Session.vim
 examples/cloud_config.rb
 ext/extconf.rb
-ext/zkc-3.3.2.tar.gz
+ext/zkc-3.3.4.tar.gz
 ext/zookeeper_base.rb
 ext/zookeeper_c.c
 ext/zookeeper_lib.c
@@ -23,11 +21,9 @@ lib/zookeeper/stat.rb
 spec/log4j.properties
 spec/spec_helper.rb
 spec/zookeeper_spec.rb
-tags
 test/test_basic.rb
 test/test_callback1.rb
 test/test_close.rb
 test/test_esoteric.rb
 test/test_watcher1.rb
 test/test_watcher2.rb
-zookeeper.gemspec

data/ext/zookeeper_lib.c

@@ -161,26 +161,22 @@ void zkrb_event_free(zkrb_event_t *event) {
     }
     case ZKRB_STRINGS: {
       struct zkrb_strings_completion *strings_ctx = event->completion.strings_completion;
-      if (strings_ctx->values != NULL) {
-        int k;
+      int k;
+      if (strings_ctx->values)
         for (k = 0; k < strings_ctx->values->count; ++k) free(strings_ctx->values->data[k]);
-        free(strings_ctx->values);
-      }
+      free(strings_ctx->values);
       free(strings_ctx);
       break;
     }
     case ZKRB_STRINGS_STAT: {
       struct zkrb_strings_stat_completion *strings_stat_ctx = event->completion.strings_stat_completion;
-      if (strings_stat_ctx->values != NULL) {
-        int k;
+      int k;
+      if (strings_stat_ctx->values)
         for (k = 0; k < strings_stat_ctx->values->count; ++k) free(strings_stat_ctx->values->data[k]);
-        free(strings_stat_ctx->values);
-      }
-
-      if (strings_stat_ctx->stat != NULL) {
-        free(strings_stat_ctx->stat);
-      }
+      free(strings_stat_ctx->values);
 
+      if (strings_stat_ctx->stat)
+	free(strings_stat_ctx->stat);
       free(strings_stat_ctx);
       break;
     }

data/lib/zookeeper/common.rb

@@ -54,9 +54,12 @@ protected
     
     callback_context = is_completion ? get_completion(hash[:req_id]) : get_watcher(hash[:req_id])
 
-    # when connectivity with the server is lost, on reconnection it's possible
-    # to receive duplicate responses. If we've already handled a response for a
-    # given req_id, this value will be nil, and we just ignore it.
+    # 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] == ZookeeperConstants::ZOO_SESSION_EVENT
+      is_completion ? setup_completion(hash[:req_id], callback_context) : setup_watcher(hash[:req_id], callback_context)
+    end
     if callback_context
       callback = is_completion ? callback_context[:callback] : callback_context[:watcher]
 

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.2.10'
+  s.version     = '0.2.11'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec