Merge branch 'fix-issue-438' of https://github.com/vrischmann/jedis

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

@@ -99,6 +99,7 @@ public class Pipeline extends MultiKeyPipelineBase {
 
     public Response<String> discard() {
         client.discard();
+        currentMulti = null;
         return getResponse(BuilderFactory.STRING);
     }
 

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

@@ -240,7 +240,19 @@ public class PipeliningTest extends Assert {
         
         assertEquals(new Long(-1), r3.get().get(0));
         assertEquals(new Long(-3), r3.get().get(1));
-        
+
+    }
+
+    @Test
+    public void testDiscardInPipeline() {
+        Pipeline pipeline = jedis.pipelined();
+        pipeline.multi();
+        pipeline.set("foo", "bar");
+        Response<String> discard = pipeline.discard();
+        Response<String> get = pipeline.get("foo");
+        pipeline.sync();
+        discard.get();
+        get.get();
     }
    
 	@Test