From f58683ea07c49aa567a3dc888b12b7de92918ed6 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Tue, 8 Sep 2015 10:03:23 -0400 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-5959 Add check to avoid NPE --- .../apache/activemq/broker/jmx/DestinationView.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java index 1fb7c76256..f701ebccde 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import javax.jms.Connection; import javax.jms.InvalidSelectorException; @@ -355,15 +356,14 @@ public class DestinationView implements DestinationViewMBean { ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(brokerUrl); Connection connection = null; try { - connection = cf.createConnection(userName, password); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(dest); ActiveMQTextMessage msg = (ActiveMQTextMessage) session.createTextMessage(body); - for (Iterator iter = headers.entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Map.Entry) iter.next(); - msg.setObjectProperty((String) entry.getKey(), entry.getValue()); + for (Iterator> iter = headers.entrySet().iterator(); iter.hasNext();) { + Entry entry = iter.next(); + msg.setObjectProperty(entry.getKey(), entry.getValue()); } producer.setDeliveryMode(msg.getJMSDeliveryMode()); @@ -383,9 +383,10 @@ public class DestinationView implements DestinationViewMBean { return msg.getJMSMessageID(); } finally { - connection.close(); + if (connection != null) { + connection.close(); + } } - } @Override