Merge pull request #78 from launchdarkly/dr/updateJedis

Update Jedis, unwatch

Author: drichelson

build.gradle

@@ -19,7 +19,7 @@ repositories {
 
 allprojects {
     group = 'com.launchdarkly'
-    version = "2.0.5"
+    version = "2.0.6-SNAPSHOT"
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 }
@@ -33,7 +33,7 @@ dependencies {
     compile "joda-time:joda-time:2.9.3"
     compile "org.slf4j:slf4j-api:1.7.21"
     compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.0.0", changing: true
-    compile "redis.clients:jedis:2.8.1"
+    compile "redis.clients:jedis:2.9.0"
     testCompile "org.easymock:easymock:3.4"
     testCompile 'junit:junit:4.12'
     testRuntime "ch.qos.logback:logback-classic:1.1.7"

src/main/java/com/launchdarkly/client/RedisFeatureStore.java

@@ -281,13 +281,17 @@ public void init(Map<String, FeatureFlag> features) {
    */
   @Override
   public void delete(String key, int version) {
-    try (Jedis jedis = pool.getResource()) {
+    Jedis jedis = null;
+    try {
       Gson gson = new Gson();
+      jedis = pool.getResource();
       jedis.watch(featuresKey());
 
       FeatureFlag feature = getRedis(key);
 
       if (feature != null && feature.getVersion() >= version) {
+        logger.warn("Attempted to delete flag: " + key + " version: " + feature.getVersion() +
+            " with a version that is the same or older: " + version);
         return;
       }
 
@@ -300,6 +304,12 @@ public void delete(String key, int version) {
         cache.invalidate(key);
       }
     }
+    finally {
+      if (jedis != null) {
+        jedis.unwatch();
+        jedis.close();
+      }
+    }
   }
 
   /**
@@ -311,13 +321,17 @@ public void delete(String key, int version) {
    */
   @Override
   public void upsert(String key, FeatureFlag feature) {
-    try (Jedis jedis = pool.getResource()) {
+    Jedis jedis = null;
+    try {
+      jedis = pool.getResource();
       Gson gson = new Gson();
       jedis.watch(featuresKey());
 
       FeatureFlag f = getRedis(key);
 
       if (f != null && f.getVersion() >= feature.getVersion()) {
+        logger.warn("Attempted to update flag: " + key + " version: " + f.getVersion() +
+            " with a version that is the same or older: " + feature.getVersion());
         return;
       }
 
@@ -326,6 +340,11 @@ public void upsert(String key, FeatureFlag feature) {
       if (cache != null) {
         cache.invalidate(key);
       }
+    } finally {
+      if (jedis != null) {
+        jedis.unwatch();
+        jedis.close();
+      }
     }
   }