Merge branch 'feature_blocklist_parameter' of https://github.com/catinred2/jedis into catinred2-feature_blocklist_parameter
Conflicts: src/main/java/redis/clients/jedis/Jedis.java src/main/java/redis/clients/jedis/JedisCluster.java
This commit is contained in:
@@ -3469,4 +3469,30 @@ public class Jedis extends BinaryJedis implements JedisCommands,
|
||||
return client.getStatusCodeReply();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> blpop(int timeout, String key) {
|
||||
checkIsInMulti();
|
||||
List<String> args = new ArrayList<String>();
|
||||
args.add(key);
|
||||
args.add(String.valueOf(timeout));
|
||||
client.blpop(args.toArray(new String[args.size()]));
|
||||
client.setTimeoutInfinite();
|
||||
final List<String> multiBulkReply = client.getMultiBulkReply();
|
||||
client.rollbackTimeout();
|
||||
return multiBulkReply;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> brpop(int timeout, String key) {
|
||||
checkIsInMulti();
|
||||
List<String> args = new ArrayList<String>();
|
||||
args.add(key);
|
||||
args.add(String.valueOf(timeout));
|
||||
client.brpop(args.toArray(new String[args.size()]));
|
||||
client.setTimeoutInfinite();
|
||||
final List<String> multiBulkReply = client.getMultiBulkReply();
|
||||
client.rollbackTimeout();
|
||||
return multiBulkReply;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user