From bfed9df3b740d08df3ebaf02a7c1e2fbbfc77087 Mon Sep 17 00:00:00 2001
From: "Timothy A. Bish" <tabish@apache.org>
Date: Thu, 6 Jun 2013 14:51:52 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-4568

fix potential NPE

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1490311 13f79535-47bb-0310-9956-ffa450edef68
---
 .../transport/amqp/AmqpTransformerTest.java        | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
index bd318282aa..d82f461e8d 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
@@ -72,7 +72,6 @@ public class AmqpTransformerTest {
         amqpSession.close();
         amqpConnection.close();
 
-
         // receive with openwire JMS
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://0.0.0.0:" + openwirePort);
         Connection openwireConn = factory.createConnection();
@@ -95,10 +94,9 @@ public class AmqpTransformerTest {
         c.close();
         session.close();
         openwireConn.close();
-
     }
 
-    @Test(timeout=30000)
+    @Test(timeout = 30000)
     public void testRawTransformation() throws Exception {
 
         // default is native
@@ -120,7 +118,6 @@ public class AmqpTransformerTest {
         amqpSession.close();
         amqpConnection.close();
 
-
         // receive with openwire JMS
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://0.0.0.0:" + openwirePort);
         Connection openwireConn = factory.createConnection();
@@ -139,15 +136,13 @@ public class AmqpTransformerTest {
         assertTrue("Didn't use the correct transformation, expected NATIVE", nativeTransformationUsed);
         assertEquals(2, message.getJMSDeliveryMode());
 
-        // should not equal 7 (should equal the default)  because "raw" does not map
+        // should not equal 7 (should equal the default) because "raw" does not map
         // headers
         assertEquals(4, message.getJMSPriority());
 
-
         c.close();
         session.close();
         openwireConn.close();
-
     }
 
     @Test
@@ -171,7 +166,6 @@ public class AmqpTransformerTest {
         amqpSession.close();
         amqpConnection.close();
 
-
         // receive with openwire JMS
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://0.0.0.0:" + openwirePort);
         Connection openwireConn = factory.createConnection();
@@ -193,7 +187,6 @@ public class AmqpTransformerTest {
         c.close();
         session.close();
         openwireConn.close();
-
     }
 
     public Connection createAmqpConnection() throws JMSException {
@@ -209,14 +202,13 @@ public class AmqpTransformerTest {
         return connection;
     }
 
-
     public void startBrokerWithAmqpTransport(String amqpUrl) throws Exception {
         brokerService = new BrokerService();
         brokerService.setPersistent(false);
         brokerService.setAdvisorySupport(false);
         brokerService.setDeleteAllMessagesOnStartup(true);
 
-        TransportConnector connector =  brokerService.addConnector(amqpUrl);
+        TransportConnector connector = brokerService.addConnector(amqpUrl);
         amqpPort = connector.getConnectUri().getPort();
         connector = brokerService.addConnector("tcp://0.0.0.0:0");
         openwirePort = connector.getConnectUri().getPort();