activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1100207 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/ test/java/org/apache/activemq/broker/store/ test/java/org/apache/activemq/store/kahadb/
Date Fri, 06 May 2011 13:26:16 GMT
Author: gtully
Date: Fri May  6 13:26:16 2011
New Revision: 1100207

URL: http://svn.apache.org/viewvc?rev=1100207&view=rev
Log:
null check in brokerSerice for jmx uri map and remove duplicated tests

Removed:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/DefaultStoreXARecoveryBrokerTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreXARecoveryBrokerTest.java
Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1100207&r1=1100206&r2=1100207&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Fri May  6 13:26:16 2011
@@ -1103,9 +1103,11 @@ public class BrokerService implements Se
         for (TransportConnector connector : transportConnectors) {
             try {
                 URI uri = connector.getConnectUri();
-                String scheme = uri.getScheme();
-                if (scheme != null) {
-                    answer.put(scheme.toLowerCase(), uri.toString());
+                if (uri != null) {
+                    String scheme = uri.getScheme();
+                    if (scheme != null) {
+                        answer.put(scheme.toLowerCase(), uri.toString());
+                    }
                 }
             } catch (Exception e) {
                 LOG.debug("Failed to read URI to build transportURIsAsMap", e);



Mime
View raw message