From 0766a18953888defa54555d82f8671376da3efec Mon Sep 17 00:00:00 2001
From: "Timothy A. Bish" <tabish@apache.org>
Date: Tue, 28 May 2013 15:11:38 +0000
Subject: [PATCH] fix for: https://issues.apache.org/jira/browse/AMQ-4559

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486959 13f79535-47bb-0310-9956-ffa450edef68
---
 .../transport/amqp/JMSClientTest.java         | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
index 969779b7ae..a77b3bc56b 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSClientTest.java
@@ -16,20 +16,27 @@
  */
 package org.apache.activemq.transport.amqp;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Enumeration;
+
+import javax.jms.Connection;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.QueueBrowser;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
 import org.apache.activemq.transport.amqp.joram.ActiveMQAdmin;
 import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
 import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
 import org.junit.Test;
 import org.objectweb.jtests.jms.framework.TestConfig;
 
-import javax.jms.*;
-
-import java.util.Enumeration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
@@ -58,7 +65,8 @@ public class JMSClientTest extends AmqpTestSupport {
 
             MessageConsumer consumer = session.createConsumer(queue);
             Message msg = consumer.receive(TestConfig.TIMEOUT);
-            assertTrue(message instanceof TextMessage);
+            assertNotNull(msg);
+            assertTrue(msg instanceof TextMessage);
         }
         connection.close();