From 6dbad882504fe1db071a26cc26d5d07a40d699ab Mon Sep 17 00:00:00 2001
From: Vincent Rischmann <vincent@rischmann.info>
Date: Tue, 6 Aug 2013 00:36:48 +0200
Subject: [PATCH] Fix issue #438

---
 src/main/java/redis/clients/jedis/Pipeline.java    |  1 +
 .../redis/clients/jedis/tests/PipeliningTest.java  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
index ee680eb..98cab69 100755
--- a/src/main/java/redis/clients/jedis/Pipeline.java
+++ b/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);
     }
 
diff --git a/src/test/java/redis/clients/jedis/tests/PipeliningTest.java b/src/test/java/redis/clients/jedis/tests/PipeliningTest.java
index ffe2c9b..9a55af9 100755
--- a/src/test/java/redis/clients/jedis/tests/PipeliningTest.java
+++ b/src/test/java/redis/clients/jedis/tests/PipeliningTest.java
@@ -240,6 +240,18 @@ 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();
     }
 }