Merge pull request #189 from vsoskov/jedis

---

the exception is returned in the list with the not formatted and formatted values.
Response.get throws the exception.

src/main/java/redis/clients/jedis/BinaryTransaction.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.Set;
 
 import redis.clients.jedis.BinaryClient.LIST_POSITION;
+import redis.clients.jedis.exceptions.JedisDataException;
 
 public class BinaryTransaction extends Queable {
     protected Client client = null;
@@ -28,10 +29,29 @@ public class BinaryTransaction extends Queable {
         }
         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;
     }
+    
+    public List<Response<?>> execGetResponse() {
+        client.exec();
+        client.getAll(1); // Discard all but the last reply
+
+        List<Object> unformatted = client.getObjectMultiBulkReply();
+        if (unformatted == null) {
+            return null;
+        }
+        List<Response<?>> response = new ArrayList<Response<?>>();
+        for (Object o : unformatted) {
+        	response.add(generateResponse(o));
+        }
+        return response;
+    }
 
     public String discard() {
         client.discard();

src/main/java/redis/clients/jedis/Connection.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 import redis.clients.jedis.Protocol.Command;
 import redis.clients.jedis.exceptions.JedisConnectionException;
+import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
@@ -213,7 +214,11 @@ public class Connection {
         List<Object> all = new ArrayList<Object>();
         flush();
         while (pipelinedCommands > except) {
-            all.add(protocol.read(inputStream));
+        	try{
+        		all.add(protocol.read(inputStream));
+        	}catch(JedisDataException e){
+        		all.add(e);
+        	}
             pipelinedCommands--;
         }
         return all;

src/main/java/redis/clients/jedis/Pipeline.java

@@ -6,6 +6,7 @@ import java.util.Map;
 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 class Pipeline extends Queable {
         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;
     }

src/main/java/redis/clients/jedis/Protocol.java

@@ -114,7 +114,11 @@ public final class Protocol {
         }
         List<Object> ret = new ArrayList<Object>(num);
         for (int i = 0; i < num; i++) {
-            ret.add(process(is));
+        	try{
+        		ret.add(process(is));
+        	}catch(JedisDataException e){
+        		ret.add(e);
+        	}
         }
         return ret;
     }

src/main/java/redis/clients/jedis/Response.java

@@ -24,6 +24,9 @@ public class Response<T> {
                     "Please close pipeline or multi block before calling this method.");
         }
         if (!built) {
+        	if (data instanceof JedisDataException){
+        		throw new JedisDataException((JedisDataException)data);
+        	}
             response = builder.build(data);
             this.data = null;
             built = true;

src/test/java/redis/clients/jedis/tests/PipeliningTest.java

@@ -118,4 +118,20 @@ public class PipeliningTest extends Assert {
         p.sync();
         assertNull(shouldNotExist.get());
     }
+    
+    @Test
+    public void piplineWithError(){
+    	Pipeline p = jedis.pipelined();
+    	p.set("foo", "bar");
+        Response<Set<String>> error = p.smembers("foo");
+        Response<String> r = p.get("foo");
+        p.sync();
+        try{
+        	error.get();
+        	fail();
+        }catch(JedisDataException e){
+        	//that is fine we should be here
+        }
+        assertEquals(r.get(), "bar");
+    }
 }

src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java

@@ -11,6 +11,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.Pipeline;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.Transaction;
 import redis.clients.jedis.TransactionBlock;
@@ -241,4 +242,39 @@ public class TransactionCommandsTest extends JedisCommandTestBase {
         string.get();
         t.exec();
     }
+    
+    @Test
+    public void transactionResponseWithError() {
+    	Transaction t = jedis.multi();
+    	t.set("foo", "bar");
+        Response<Set<String>> error = t.smembers("foo");
+        Response<String> r = t.get("foo");
+        List<Object> l = t.exec();
+        assertEquals(JedisDataException.class, l.get(1).getClass());
+        try{
+        	error.get();
+        	fail("We expect exception here!");
+        }catch(JedisDataException e){
+        	//that is fine we should be here
+        }
+        assertEquals(r.get(), "bar");
+    }
+    
+    @Test
+    public void execGetResponse() {
+        Transaction t = jedis.multi();
+
+        t.set("foo", "bar");
+        t.smembers("foo");
+        t.get("foo");
+
+        List<Response<?>> lr = t.execGetResponse();
+        try{
+        	lr.get(1).get();
+        	fail("We expect exception here!");
+        }catch(JedisDataException e){
+        	//that is fine we should be here
+        }
+        assertEquals("bar", lr.get(2).get());
+    }
 }