Skip to content

Commit 80d2f9d

Browse files
author
Jonathan Leibiusky
committed
Merge branch 'pipeline-multi' of git://github.com/pietern/jedis into pietern-pipeline-multi
Conflicts: src/main/java/redis/clients/jedis/Connection.java src/main/java/redis/clients/jedis/Transaction.java
2 parents 333a9bc + e7e4c4c commit 80d2f9d

File tree

6 files changed

+198
-399
lines changed

6 files changed

+198
-399
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,19 +1631,18 @@ public Double zscore(final byte[] key, final byte[] member) {
16311631

16321632
public Transaction multi() {
16331633
client.multi();
1634-
client.getStatusCodeReply();
16351634
return new Transaction(client);
16361635
}
16371636

16381637
public List<Object> multi(final TransactionBlock jedisTransaction) {
16391638
List<Object> results = null;
1639+
jedisTransaction.setClient(client);
16401640
try {
1641-
jedisTransaction.setClient(client);
1642-
multi();
1641+
client.multi();
16431642
jedisTransaction.execute();
16441643
results = jedisTransaction.exec();
16451644
} catch (Exception ex) {
1646-
client.discard();
1645+
jedisTransaction.discard();
16471646
}
16481647
return results;
16491648
}

0 commit comments

Comments
 (0)