From bb236634f0222d26038da668442f72d5330552b1 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 15 Mar 2011 22:11:57 +0200
Subject: [PATCH] + update return signature for jedis exec

---
 .../redis/connection/DefaultStringRedisConnection.java   | 2 +-
 .../data/keyvalue/redis/connection/RedisTxCommands.java  | 2 +-
 .../keyvalue/redis/connection/jedis/JedisConnection.java | 9 +++++++--
 .../redis/connection/jredis/JredisConnection.java        | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java
index 3d857e3df..f966bbee8 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/DefaultStringRedisConnection.java
@@ -116,7 +116,7 @@ public class DefaultStringRedisConnection implements StringRedisConnection {
 		return delegate.echo(message);
 	}
 
-	public List<Object> exec() {
+	public List<byte[]> exec() {
 		return delegate.exec();
 	}
 
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java
index 73f82f600..79f14bec4 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/RedisTxCommands.java
@@ -27,7 +27,7 @@ public interface RedisTxCommands {
 
 	void multi();
 
-	List<Object> exec();
+	List<byte[]> exec();
 
 	void discard();
 
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java
index d3f898769..6f4286615 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java
@@ -511,14 +511,19 @@ public class JedisConnection implements RedisConnection {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public List<Object> exec() {
+	public List<byte[]> exec() {
 		try {
 			if (isPipelined()) {
 				pipeline.exec();
 				return null;
 			}
-			return transaction.exec();
+			List execute = transaction.exec();
+			if (execute != null && !execute.isEmpty()) {
+				return (List<byte[]>) execute;
+			}
+			return Collections.emptyList();
 		} catch (Exception ex) {
 			throw convertJedisAccessException(ex);
 		}
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java
index dca7e829d..92f5ebc34 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jredis/JredisConnection.java
@@ -267,7 +267,7 @@ public class JredisConnection implements RedisConnection {
 	}
 
 	@Override
-	public List<Object> exec() {
+	public List<byte[]> exec() {
 		throw new UnsupportedOperationException();
 	}