Merge pull request redis#145 from TioBorracho/Cleaning

When there is a connection error, disconnect to leave everything clean.
kevinsawicki · May 16, 2011 · 4bc292e · 4bc292e
2 parents 6a78b32 + 5c9d516
commit 4bc292e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,6 @@
 .gradle/
 target/
 build/
+/appendonly.aof
+/dump.rdb
+/nohup.out
diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java
@@ -61,6 +61,24 @@ protected void flush() {
         }
     }
 
+    protected Object read() {
+        try {
+           return protocol.read(inputStream);
+        } catch (JedisConnectionException e) {
+            disconnect();
+            throw new JedisConnectionException(e);
+        }
+    }
+
+    protected void sendProtocolCommand(final Command cmd, final byte[]... args) {
+       try {
+            protocol.sendCommand(outputStream, cmd, args);
+        } catch (JedisConnectionException e) {
+            disconnect();
+            throw new JedisConnectionException(e);
+        }
+    }
+
     protected Connection sendCommand(final Command cmd, final String... args) {
         final byte[][] bargs = new byte[args.length][];
         for (int i = 0; i < args.length; i++) {
@@ -71,14 +89,14 @@ protected Connection sendCommand(final Command cmd, final String... args) {
 
     protected Connection sendCommand(final Command cmd, final byte[]... args) {
         connect();
-        protocol.sendCommand(outputStream, cmd, args);
+        sendProtocolCommand(cmd, args);
         pipelinedCommands++;
         return this;
     }
 
     protected Connection sendCommand(final Command cmd) {
         connect();
-        protocol.sendCommand(outputStream, cmd, new byte[0][]);
+        sendProtocolCommand(cmd, new byte[0][]);
         pipelinedCommands++;
         return this;
     }
@@ -145,7 +163,7 @@ public boolean isConnected() {
     protected String getStatusCodeReply() {
         flush();
         pipelinedCommands--;
-        final byte[] resp = (byte[]) protocol.read(inputStream);
+        final byte[] resp = (byte[]) read(); 
         if (null == resp) {
             return null;
         } else {
@@ -165,13 +183,13 @@ public String getBulkReply() {
     public byte[] getBinaryBulkReply() {
         flush();
         pipelinedCommands--;
-        return (byte[]) protocol.read(inputStream);
+        return (byte[]) read();
     }
 
     public Long getIntegerReply() {
         flush();
         pipelinedCommands--;
-        return (Long) protocol.read(inputStream);
+        return (Long) read();
     }
 
     public List<String> getMultiBulkReply() {
@@ -182,14 +200,14 @@ public List<String> getMultiBulkReply() {
     public List<byte[]> getBinaryMultiBulkReply() {
         flush();
         pipelinedCommands--;
-        return (List<byte[]>) protocol.read(inputStream);
+        return (List<byte[]>) read();
     }
 
     @SuppressWarnings("unchecked")
     public List<Object> getObjectMultiBulkReply() {
         flush();
         pipelinedCommands--;
-        return (List<Object>) protocol.read(inputStream);
+        return (List<Object>) read();
     }
 
     public List<Object> getAll() {
@@ -200,7 +218,7 @@ public List<Object> getAll(int except) {
         List<Object> all = new ArrayList<Object>();
         flush();
         while (pipelinedCommands > except) {
-            all.add(protocol.read(inputStream));
+            all.add(read());
             pipelinedCommands--;
         }
         return all;
@@ -209,6 +227,6 @@ public List<Object> getAll(int except) {
     public Object getOne() {
         flush();
         pipelinedCommands--;
-        return protocol.read(inputStream);
+        return read();
     }
-}
+}