Use #discard on the transaction object
This commit is contained in:
@@ -1636,13 +1636,13 @@ public class BinaryJedis implements BinaryJedisCommands {
|
|||||||
|
|
||||||
public List<Object> multi(final TransactionBlock jedisTransaction) {
|
public List<Object> multi(final TransactionBlock jedisTransaction) {
|
||||||
List<Object> results = null;
|
List<Object> results = null;
|
||||||
|
jedisTransaction.setClient(client);
|
||||||
try {
|
try {
|
||||||
client.multi();
|
client.multi();
|
||||||
jedisTransaction.setClient(client);
|
|
||||||
jedisTransaction.execute();
|
jedisTransaction.execute();
|
||||||
results = jedisTransaction.exec();
|
results = jedisTransaction.exec();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
client.discard();
|
jedisTransaction.discard();
|
||||||
}
|
}
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1625,24 +1625,6 @@ public class Jedis extends BinaryJedis implements JedisCommands {
|
|||||||
return (score != null ? new Double(score) : null);
|
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() {
|
private void runChecks() {
|
||||||
if (client.isInMulti()) {
|
if (client.isInMulti()) {
|
||||||
throw new JedisDataException(
|
throw new JedisDataException(
|
||||||
|
|||||||
Reference in New Issue
Block a user