INT-3576: Fix NPE in the RedisAvailableTests

JIRA: https://jira.spring.io/browse/INT-3576
joobn72 · Dec 10, 2014 · 8ec4ab0 · 8ec4ab0
1 parent 3d43ad1
commit 8ec4ab0
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java b/...-redis/src/test/java/org/springframework/integration/redis/rules/RedisAvailableTests.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.redis.rules;
 
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Rule;
@@ -50,10 +52,17 @@ protected RedisConnectionFactory getConnectionFactoryForTest() {
 	}
 
 	protected void awaitContainerSubscribed(RedisMessageListenerContainer container) throws Exception {
-		RedisConnection connection = TestUtils.getPropertyValue(container, "subscriptionTask.connection",
-				RedisConnection.class);
+		RedisConnection connection = null;
 
 		int n = 0;
+		while (n++ < 100 &&
+				(connection =
+				TestUtils.getPropertyValue(container, "subscriptionTask.connection", RedisConnection .class)) == null) {
+			Thread.sleep(100);
+		}
+		assertNotNull("RedisMessageListenerContainer Failed to Connect", connection);
+
+		n = 0;
 		while (n++ < 100 && !connection.isSubscribed()) {
 			Thread.sleep(100);
 		}