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

Merge branch 'variadic' of git://github.com/ivowiblo/jedis into variadic

Browse Source 
Conflicts:
	src/main/java/redis/clients/jedis/BinaryClient.java
	src/main/java/redis/clients/jedis/BinaryJedis.java
	src/main/java/redis/clients/jedis/BinaryShardedJedis.java
	src/main/java/redis/clients/jedis/Client.java
	src/main/java/redis/clients/jedis/Commands.java
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
This commit is contained in:
Jonathan Leibiusky
2012-04-23 21:00:29 -03:00
parent 3da2f2dd57 dd88c51db8
commit 05503212aa
13 changed files with 976 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/redis/clients/jedis/Pipeline.java
View File

@@ -672,14 +672,14 @@ public class Pipeline extends Queable {
return getResponse(BuilderFactory.LONG);
}
public Response<List<String>> sort(String key) {
public Response<Long> sort(String key) {
client.sort(key);
return getResponse(BuilderFactory.STRING_LIST);
return getResponse(BuilderFactory.LONG);
}
public Response<List<String>> sort(byte[] key) {
public Response<Long> sort(byte[] key) {
client.sort(key);
return getResponse(BuilderFactory.STRING_LIST);
return getResponse(BuilderFactory.LONG);
}
public Response<List<String>> sort(String key,