From e7e4c4c26d3966e6c9f83c391ba7522b853f36d5 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Fri, 25 Feb 2011 13:58:48 +0100
Subject: [PATCH] Use #discard on the transaction object

---
 .../java/redis/clients/jedis/BinaryJedis.java  |  4 ++--
 src/main/java/redis/clients/jedis/Jedis.java   | 18 ------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
index 479f0c2..11fc9fb 100644
--- a/src/main/java/redis/clients/jedis/BinaryJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -1636,13 +1636,13 @@ public class BinaryJedis implements BinaryJedisCommands {
 
     public List<Object> multi(final TransactionBlock jedisTransaction) {
         List<Object> results = null;
+        jedisTransaction.setClient(client);
         try {
             client.multi();
-            jedisTransaction.setClient(client);
             jedisTransaction.execute();
             results = jedisTransaction.exec();
         } catch (Exception ex) {
-            client.discard();
+            jedisTransaction.discard();
         }
         return results;
     }
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 2c63263..cd9c9ab 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -1625,24 +1625,6 @@ public class Jedis extends BinaryJedis implements JedisCommands {
         return (score != null ? new Double(score) : null);
     }
 
-    public Transaction multi() {
-        client.multi();
-        return new Transaction(client);
-    }
-
-    public List<Object> multi(final TransactionBlock jedisTransaction) {
-        List<Object> results = null;
-        try {
-            client.multi();
-            jedisTransaction.setClient(client);
-            jedisTransaction.execute();
-            results = jedisTransaction.exec();
-        } catch (Exception ex) {
-            client.discard();
-        }
-        return results;
-    }
-
     private void runChecks() {
         if (client.isInMulti()) {
             throw new JedisDataException(