You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/01/20 05:19:43 UTC
activemq-artemis git commit: ARTEMIS-347 Fixing NPE
Repository: activemq-artemis
Updated Branches:
refs/heads/master 2d4654ca2 -> 0a9a6c92f
ARTEMIS-347 Fixing NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0a9a6c92
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0a9a6c92
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0a9a6c92
Branch: refs/heads/master
Commit: 0a9a6c92f4d2713ffe01639296587ab00566630a
Parents: 2d4654c
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jan 19 23:14:47 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jan 19 23:15:10 2016 -0500
----------------------------------------------------------------------
.../artemis/core/config/ClusterConnectionConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a9a6c92/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
index f3f2b25..3c715af 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
@@ -377,7 +377,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
return list.toArray(new TransportConfiguration[list.size()]);
}
else {
- return configuration.getTransportConfigurations(staticConnectors);
+ return staticConnectors != null ? configuration.getTransportConfigurations(staticConnectors) : null;
}
}