You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/09/08 16:03:58 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5959
Repository: activemq
Updated Branches:
refs/heads/master ad00e1fe5 -> f58683ea0
https://issues.apache.org/jira/browse/AMQ-5959
Add check to avoid NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f58683ea
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f58683ea
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f58683ea
Branch: refs/heads/master
Commit: f58683ea07c49aa567a3dc888b12b7de92918ed6
Parents: ad00e1f
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Sep 8 10:03:23 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Sep 8 10:03:23 2015 -0400
----------------------------------------------------------------------
.../apache/activemq/broker/jmx/DestinationView.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/f58683ea/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
----------------------------------------------------------------------
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 1fb7c76..f701ebc 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<Entry<String, String>> iter = headers.entrySet().iterator(); iter.hasNext();) {
+ Entry<String, String> 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