Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status
* it's broken with later features, resetState() * fixed resetState() to make it work with this PR Conflicts: src/main/java/redis/clients/jedis/BinaryJedis.java src/main/java/redis/clients/jedis/Connection.java src/main/java/redis/clients/jedis/Pipeline.java src/main/java/redis/clients/jedis/Transaction.java src/main/java/redis/clients/jedis/TransactionBlock.java
This commit is contained in:
@@ -7,21 +7,21 @@ public class Queable {
|
||||
private Queue<Response<?>> pipelinedResponses = new LinkedList<Response<?>>();
|
||||
|
||||
protected void clean() {
|
||||
pipelinedResponses.clear();
|
||||
pipelinedResponses.clear();
|
||||
}
|
||||
|
||||
protected Response<?> generateResponse(Object data) {
|
||||
Response<?> response = pipelinedResponses.poll();
|
||||
if (response != null) {
|
||||
response.set(data);
|
||||
}
|
||||
return response;
|
||||
Response<?> response = pipelinedResponses.poll();
|
||||
if (response != null) {
|
||||
response.set(data);
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
protected <T> Response<T> getResponse(Builder<T> builder) {
|
||||
Response<T> lr = new Response<T>(builder);
|
||||
pipelinedResponses.add(lr);
|
||||
return lr;
|
||||
Response<T> lr = new Response<T>(builder);
|
||||
pipelinedResponses.add(lr);
|
||||
return lr;
|
||||
}
|
||||
|
||||
protected boolean hasPipelinedResponse() {
|
||||
|
||||
Reference in New Issue
Block a user