From 7c680634a3af01b42884c129a89f7e32973bee6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KARASZI=20Istv=C3=A1n?= <github@spam.raszi.hu>
Date: Fri, 10 Sep 2010 18:45:11 +0800
Subject: [PATCH] autoboxings fixed

---
 src/main/java/redis/clients/jedis/Connection.java  | 2 +-
 src/main/java/redis/clients/jedis/Jedis.java       | 9 ++++-----
 src/main/java/redis/clients/jedis/JedisPubSub.java | 8 ++++----
 src/main/java/redis/clients/jedis/Protocol.java    | 4 +---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java
index 794c398..1316b35 100644
--- a/src/main/java/redis/clients/jedis/Connection.java
+++ b/src/main/java/redis/clients/jedis/Connection.java
@@ -125,7 +125,7 @@ public class Connection {
 
     public int getIntegerReply() {
 	pipelinedCommands--;
-	return (Integer) protocol.read(inputStream);
+	return ((Integer) protocol.read(inputStream)).intValue();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 9a14037..db7c84e 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -467,7 +467,7 @@ public class Jedis {
 	checkIsInMulti();
 	client.zincrby(key, score, member);
 	String newscore = client.getBulkReply();
-	return Double.valueOf(newscore);
+	return Double.valueOf(newscore).doubleValue();
     }
 
     public int zrank(String key, String member) {
@@ -513,7 +513,7 @@ public class Jedis {
 	checkIsInMulti();
 	client.zscore(key, member);
 	String score = client.getBulkReply();
-	return Double.valueOf(score);
+	return Double.valueOf(score).doubleValue();
     }
 
     public Transaction multi() {
@@ -684,9 +684,8 @@ public class Jedis {
 	Set<Tuple> set = new LinkedHashSet<Tuple>();
 	Iterator<String> iterator = membersWithScores.iterator();
 	while (iterator.hasNext()) {
-	    set
-		    .add(new Tuple(iterator.next(), Double.valueOf(iterator
-			    .next())));
+	    set.add(new Tuple(iterator.next(), Double.valueOf(iterator.next())
+		    .doubleValue()));
 	}
 	return set;
     }
diff --git a/src/main/java/redis/clients/jedis/JedisPubSub.java b/src/main/java/redis/clients/jedis/JedisPubSub.java
index 7bc9e1d..31d1f5e 100644
--- a/src/main/java/redis/clients/jedis/JedisPubSub.java
+++ b/src/main/java/redis/clients/jedis/JedisPubSub.java
@@ -51,10 +51,10 @@ public abstract class JedisPubSub {
 	do {
 	    List<Object> reply = client.getObjectMultiBulkReply();
 	    if (reply.get(0).equals("subscribe")) {
-		subscribedChannels = (Integer) reply.get(2);
+		subscribedChannels = ((Integer) reply.get(2)).intValue();
 		onSubscribe((String) reply.get(1), subscribedChannels);
 	    } else if (reply.get(0).equals("unsubscribe")) {
-		subscribedChannels = (Integer) reply.get(2);
+		subscribedChannels = ((Integer) reply.get(2)).intValue();
 		onUnsubscribe((String) reply.get(1), subscribedChannels);
 	    } else if (reply.get(0).equals("message")) {
 		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),
 			(String) reply.get(3));
 	    } else if (reply.get(0).equals("psubscribe")) {
-		subscribedChannels = (Integer) reply.get(2);
+		subscribedChannels = ((Integer) reply.get(2)).intValue();
 		onPSubscribe((String) reply.get(1), subscribedChannels);
 	    } else if (reply.get(0).equals("punsubscribe")) {
-		subscribedChannels = (Integer) reply.get(2);
+		subscribedChannels = ((Integer) reply.get(2)).intValue();
 		onPUnsubscribe((String) reply.get(1), subscribedChannels);
 	    } else {
 		throw new JedisException("Unknown message type: "
diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java
index 3c1ff30..6cb2023 100644
--- a/src/main/java/redis/clients/jedis/Protocol.java
+++ b/src/main/java/redis/clients/jedis/Protocol.java
@@ -155,10 +155,8 @@ public class Protocol {
     }
 
     private Object processInteger(DataInputStream is) {
-	int ret = 0;
 	String num = readLine(is);
-	ret = Integer.parseInt(num);
-	return ret;
+	return Integer.valueOf(num);
     }
 
     private Object processMultiBulkReply(DataInputStream is) {