rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pipeline-multi' of git://github.com/pietern/jedis into pietern-pipeline-multi

Browse Source 
Conflicts:
	src/main/java/redis/clients/jedis/Connection.java
	src/main/java/redis/clients/jedis/Transaction.java
This commit is contained in:
Jonathan Leibiusky
2011-02-28 15:56:11 -03:00
parent 333a9bc6b3 e7e4c4c26d
commit 80d2f9d103
6 changed files with 205 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/redis/clients/jedis/BinaryJedis.java
View File

@@ -1631,19 +1631,18 @@ public class BinaryJedis implements BinaryJedisCommands {
public Transaction multi() {
client.multi();
client.getStatusCodeReply();
return new Transaction(client);
}
public List<Object> multi(final TransactionBlock jedisTransaction) {
List<Object> results = null;
jedisTransaction.setClient(client);
try {
jedisTransaction.setClient(client);
multi();
client.multi();
jedisTransaction.execute();
results = jedisTransaction.exec();
} catch (Exception ex) {
client.discard();
jedisTransaction.discard();
}
return results;
}