fixing Issue 188 - Pipline.syncAndReturnAll changes

jasonab · Aug 1, 2011 · ec0b58e · ec0b58e
1 parent 22d4d3f
commit ec0b58e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -6,6 +6,7 @@
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class Pipeline extends Queable {
     private Client client;
@@ -39,7 +40,11 @@ public List<Object> syncAndReturnAll() {
         List<Object> unformatted = client.getAll();
         List<Object> formatted = new ArrayList<Object>();
         for (Object o : unformatted) {
-            formatted.add(generateResponse(o).get());
+        	try{
+        		formatted.add(generateResponse(o).get());
+        	}catch(JedisDataException e){
+        		formatted.add(e);
+        	}
         }
         return formatted;
     }