autoboxings fixed

This commit is contained in:
KARASZI István
2010-09-10 18:45:11 +08:00
committed by Jonathan Leibiusky
parent 97e2a50f60
commit 7c680634a3
4 changed files with 10 additions and 13 deletions

View File

@@ -125,7 +125,7 @@ public class Connection {
public int getIntegerReply() { public int getIntegerReply() {
pipelinedCommands--; pipelinedCommands--;
return (Integer) protocol.read(inputStream); return ((Integer) protocol.read(inputStream)).intValue();
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")

View File

@@ -467,7 +467,7 @@ public class Jedis {
checkIsInMulti(); checkIsInMulti();
client.zincrby(key, score, member); client.zincrby(key, score, member);
String newscore = client.getBulkReply(); String newscore = client.getBulkReply();
return Double.valueOf(newscore); return Double.valueOf(newscore).doubleValue();
} }
public int zrank(String key, String member) { public int zrank(String key, String member) {
@@ -513,7 +513,7 @@ public class Jedis {
checkIsInMulti(); checkIsInMulti();
client.zscore(key, member); client.zscore(key, member);
String score = client.getBulkReply(); String score = client.getBulkReply();
return Double.valueOf(score); return Double.valueOf(score).doubleValue();
} }
public Transaction multi() { public Transaction multi() {
@@ -684,9 +684,8 @@ public class Jedis {
Set<Tuple> set = new LinkedHashSet<Tuple>(); Set<Tuple> set = new LinkedHashSet<Tuple>();
Iterator<String> iterator = membersWithScores.iterator(); Iterator<String> iterator = membersWithScores.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
set set.add(new Tuple(iterator.next(), Double.valueOf(iterator.next())
.add(new Tuple(iterator.next(), Double.valueOf(iterator .doubleValue()));
.next())));
} }
return set; return set;
} }

View File

@@ -51,10 +51,10 @@ public abstract class JedisPubSub {
do { do {
List<Object> reply = client.getObjectMultiBulkReply(); List<Object> reply = client.getObjectMultiBulkReply();
if (reply.get(0).equals("subscribe")) { if (reply.get(0).equals("subscribe")) {
subscribedChannels = (Integer) reply.get(2); subscribedChannels = ((Integer) reply.get(2)).intValue();
onSubscribe((String) reply.get(1), subscribedChannels); onSubscribe((String) reply.get(1), subscribedChannels);
} else if (reply.get(0).equals("unsubscribe")) { } else if (reply.get(0).equals("unsubscribe")) {
subscribedChannels = (Integer) reply.get(2); subscribedChannels = ((Integer) reply.get(2)).intValue();
onUnsubscribe((String) reply.get(1), subscribedChannels); onUnsubscribe((String) reply.get(1), subscribedChannels);
} else if (reply.get(0).equals("message")) { } else if (reply.get(0).equals("message")) {
onMessage((String) reply.get(1), (String) reply.get(2)); onMessage((String) reply.get(1), (String) reply.get(2));
@@ -62,10 +62,10 @@ public abstract class JedisPubSub {
onPMessage((String) reply.get(1), (String) reply.get(2), onPMessage((String) reply.get(1), (String) reply.get(2),
(String) reply.get(3)); (String) reply.get(3));
} else if (reply.get(0).equals("psubscribe")) { } else if (reply.get(0).equals("psubscribe")) {
subscribedChannels = (Integer) reply.get(2); subscribedChannels = ((Integer) reply.get(2)).intValue();
onPSubscribe((String) reply.get(1), subscribedChannels); onPSubscribe((String) reply.get(1), subscribedChannels);
} else if (reply.get(0).equals("punsubscribe")) { } else if (reply.get(0).equals("punsubscribe")) {
subscribedChannels = (Integer) reply.get(2); subscribedChannels = ((Integer) reply.get(2)).intValue();
onPUnsubscribe((String) reply.get(1), subscribedChannels); onPUnsubscribe((String) reply.get(1), subscribedChannels);
} else { } else {
throw new JedisException("Unknown message type: " throw new JedisException("Unknown message type: "

View File

@@ -155,10 +155,8 @@ public class Protocol {
} }
private Object processInteger(DataInputStream is) { private Object processInteger(DataInputStream is) {
int ret = 0;
String num = readLine(is); String num = readLine(is);
ret = Integer.parseInt(num); return Integer.valueOf(num);
return ret;
} }
private Object processMultiBulkReply(DataInputStream is) { private Object processMultiBulkReply(DataInputStream is) {