Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/redis/clients/jedis/Jedis.java
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,17 @@ public void close() {

// Legacy
public Transaction multi() {
transaction = new Transaction(this);
transaction = new Transaction(getConnection()) {
@Override
protected void onAfterExec() {
resetState();
}

@Override
protected void onAfterDiscard() {
resetState();
}
};
return transaction;
}

Expand Down
33 changes: 18 additions & 15 deletions src/main/java/redis/clients/jedis/Transaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,13 @@ public class Transaction extends AbstractTransaction {

private final Queue<Response<?>> pipelinedResponses = new LinkedList<>();

private Jedis jedis = null;

protected final Connection connection;
private final boolean closeConnection;

private boolean broken = false;
private boolean inWatch = false;
private boolean inMulti = false;

// Legacy - to support Jedis.multi()
// TODO: Should be package private ??
public Transaction(Jedis jedis) {
this(jedis.getConnection());
this.jedis = jedis;
}

/**
* Creates a new transaction.
*
Expand Down Expand Up @@ -211,9 +202,7 @@ public List<Object> exec() {
inMulti = false;
inWatch = false;
pipelinedResponses.clear();
if (jedis != null) {
jedis.resetState();
}
onAfterExec();
}
}

Expand All @@ -238,9 +227,23 @@ public String discard() {
inMulti = false;
inWatch = false;
pipelinedResponses.clear();
if (jedis != null) {
jedis.resetState();
}
onAfterDiscard();
}
}

/**
* Hook method called after exec() completes (successfully or with error).
* Subclasses can override this to perform cleanup actions.
*/
protected void onAfterExec() {
// Default implementation does nothing
}

/**
* Hook method called after discard() completes (successfully or with error).
* Subclasses can override this to perform cleanup actions.
*/
protected void onAfterDiscard() {
// Default implementation does nothing
}
}
Loading