From f507d2a89a9a4b78dc56cec6ff3516dc7d33d4db Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 11 Jan 2011 19:17:10 +0200
Subject: [PATCH] DATAKV-22 + add small integration test & small bug fix

---
 .../connection/jedis/JedisSubscription.java   |  4 +-
 .../JedisConnectionIntegrationTests.java      | 44 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisSubscription.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisSubscription.java
index de69b89aa..6f851f411 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisSubscription.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisSubscription.java
@@ -43,13 +43,13 @@ class JedisSubscription implements Subscription {
 		this.listener = listener;
 		this.jedisPubSub = jedisPubSub;
 
-		if (!ObjectUtils.isArray(channels)) {
+		if (!ObjectUtils.isEmpty(channels)) {
 			for (byte[] bs : channels) {
 				this.channels.add(bs);
 			}
 		}
 
-		if (!ObjectUtils.isArray(patterns)) {
+		if (!ObjectUtils.isEmpty(patterns)) {
 			for (byte[] bs : patterns) {
 				this.patterns.add(bs);
 			}
diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java
index e9f01b5fa..e8691a8b5 100644
--- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java
+++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionIntegrationTests.java
@@ -16,8 +16,12 @@
 
 package org.springframework.data.keyvalue.redis.connection.jedis;
 
+import static org.junit.Assert.*;
+
+import org.junit.Test;
 import org.springframework.data.keyvalue.redis.SettingsUtils;
 import org.springframework.data.keyvalue.redis.connection.AbstractConnectionIntegrationTests;
+import org.springframework.data.keyvalue.redis.connection.MessageListener;
 import org.springframework.data.keyvalue.redis.connection.RedisConnectionFactory;
 
 public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrationTests {
@@ -26,7 +30,7 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati
 
 	public JedisConnectionIntegrationTests() {
 		factory = new JedisConnectionFactory();
-		factory.setUsePool(false);
+		factory.setUsePool(true);
 
 		factory.setPort(SettingsUtils.getPort());
 		factory.setHostName(SettingsUtils.getHost());
@@ -39,6 +43,44 @@ public class JedisConnectionIntegrationTests extends AbstractConnectionIntegrati
 		return factory;
 	}
 
+	@Test
+	public void testPubSub() {
+		final byte[] expectedChannel = "channel1".getBytes();
+		final byte[] expectedMessage = "msg".getBytes();
+
+		MessageListener listener = new MessageListener() {
+
+			@Override
+			public void onMessage(byte[] message, byte[] channel, byte[] pattern) {
+				assertArrayEquals(expectedChannel, channel);
+				assertArrayEquals(expectedMessage, message);
+				System.out.println("Received message '" + new String(message) + "'");
+			}
+		};
+
+		Thread th = new Thread(new Runnable() {
+			@Override
+			public void run() {
+				// sleep 1 second to let the registration happen
+				try {
+					Thread.currentThread().sleep(1000);
+				} catch (InterruptedException ex) {
+					throw new RuntimeException(ex);
+				}
+
+				// open a new connection
+				JedisConnection connection2 = factory.getConnection();
+				connection2.publish(expectedMessage, expectedChannel);
+				connection2.close();
+				// unsubscribe connection
+				connection.getSubscription().unsubscribe();
+			}
+		});
+
+		th.start();
+		connection.subscribe(listener, expectedChannel);
+	}
+
 //	@Test
 //	public void setAdd() {
 //		connection.sadd("s1", "1");