Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-6549 

Fix bad logger output
This commit is contained in:
Timothy Bish 2017-01-03 09:57:13 -05:00
parent 8a34ca0ec7
commit 56917c07ec
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -180,11 +180,11 @@ public class BrokerService implements Service {
private PersistenceAdapterFactory persistenceFactory; private PersistenceAdapterFactory persistenceFactory;
protected DestinationFactory destinationFactory; protected DestinationFactory destinationFactory;
private MessageAuthorizationPolicy messageAuthorizationPolicy; private MessageAuthorizationPolicy messageAuthorizationPolicy;
private final List<TransportConnector> transportConnectors = new CopyOnWriteArrayList<TransportConnector>(); private final List<TransportConnector> transportConnectors = new CopyOnWriteArrayList<>();
private final List<NetworkConnector> networkConnectors = new CopyOnWriteArrayList<NetworkConnector>(); private final List<NetworkConnector> networkConnectors = new CopyOnWriteArrayList<>();
private final List<ProxyConnector> proxyConnectors = new CopyOnWriteArrayList<ProxyConnector>(); private final List<ProxyConnector> proxyConnectors = new CopyOnWriteArrayList<>();
private final List<JmsConnector> jmsConnectors = new CopyOnWriteArrayList<JmsConnector>(); private final List<JmsConnector> jmsConnectors = new CopyOnWriteArrayList<>();
private final List<Service> services = new ArrayList<Service>(); private final List<Service> services = new ArrayList<>();
private transient Thread shutdownHook; private transient Thread shutdownHook;
private String[] transportConnectorURIs; private String[] transportConnectorURIs;
private String[] networkConnectorURIs; private String[] networkConnectorURIs;
@ -229,7 +229,7 @@ public class BrokerService implements Service {
private boolean dedicatedTaskRunner; private boolean dedicatedTaskRunner;
private boolean cacheTempDestinations = false;// useful for failover private boolean cacheTempDestinations = false;// useful for failover
private int timeBeforePurgeTempDestinations = 5000; private int timeBeforePurgeTempDestinations = 5000;
private final List<Runnable> shutdownHooks = new ArrayList<Runnable>(); private final List<Runnable> shutdownHooks = new ArrayList<>();
private boolean systemExitOnShutdown; private boolean systemExitOnShutdown;
private int systemExitOnShutdownExitCode; private int systemExitOnShutdownExitCode;
private SslContext sslContext; private SslContext sslContext;
@ -623,7 +623,7 @@ public class BrokerService implements Service {
startBroker(startAsync); startBroker(startAsync);
brokerRegistry.bind(getBrokerName(), BrokerService.this); brokerRegistry.bind(getBrokerName(), BrokerService.this);
} catch (Exception e) { } catch (Exception e) {
LOG.error("Failed to start Apache ActiveMQ ({}, {})", new Object[]{ getBrokerName(), brokerId }, e); LOG.error("Failed to start Apache ActiveMQ ({}, {})", getBrokerName(), brokerId, e);
try { try {
if (!stopped.get()) { if (!stopped.get()) {
stop(); stop();
@ -1374,7 +1374,7 @@ public class BrokerService implements Service {
} }
public Map<String, String> getTransportConnectorURIsAsMap() { public Map<String, String> getTransportConnectorURIsAsMap() {
Map<String, String> answer = new HashMap<String, String>(); Map<String, String> answer = new HashMap<>();
for (TransportConnector connector : transportConnectors) { for (TransportConnector connector : transportConnectors) {
try { try {
URI uri = connector.getConnectUri(); URI uri = connector.getConnectUri();
@ -1495,7 +1495,7 @@ public class BrokerService implements Service {
} }
public List<TransportConnector> getTransportConnectors() { public List<TransportConnector> getTransportConnectors() {
return new ArrayList<TransportConnector>(transportConnectors); return new ArrayList<>(transportConnectors);
} }
/** /**
@ -1530,11 +1530,11 @@ public class BrokerService implements Service {
} }
public List<NetworkConnector> getNetworkConnectors() { public List<NetworkConnector> getNetworkConnectors() {
return new ArrayList<NetworkConnector>(networkConnectors); return new ArrayList<>(networkConnectors);
} }
public List<ProxyConnector> getProxyConnectors() { public List<ProxyConnector> getProxyConnectors() {
return new ArrayList<ProxyConnector>(proxyConnectors); return new ArrayList<>(proxyConnectors);
} }
/** /**
@ -2390,7 +2390,7 @@ public class BrokerService implements Service {
* Create the default destination interceptor * Create the default destination interceptor
*/ */
protected DestinationInterceptor[] createDefaultDestinationInterceptor() { protected DestinationInterceptor[] createDefaultDestinationInterceptor() {
List<DestinationInterceptor> answer = new ArrayList<DestinationInterceptor>(); List<DestinationInterceptor> answer = new ArrayList<>();
if (isUseVirtualTopics()) { if (isUseVirtualTopics()) {
VirtualDestinationInterceptor interceptor = new VirtualDestinationInterceptor(); VirtualDestinationInterceptor interceptor = new VirtualDestinationInterceptor();
VirtualTopic virtualTopic = new VirtualTopic(); VirtualTopic virtualTopic = new VirtualTopic();
@ -2604,7 +2604,7 @@ public class BrokerService implements Service {
*/ */
public void startAllConnectors() throws Exception { public void startAllConnectors() throws Exception {
Set<ActiveMQDestination> durableDestinations = getBroker().getDurableDestinations(); Set<ActiveMQDestination> durableDestinations = getBroker().getDurableDestinations();
List<TransportConnector> al = new ArrayList<TransportConnector>(); List<TransportConnector> al = new ArrayList<>();
for (Iterator<TransportConnector> iter = getTransportConnectors().iterator(); iter.hasNext();) { for (Iterator<TransportConnector> iter = getTransportConnectors().iterator(); iter.hasNext();) {
TransportConnector connector = iter.next(); TransportConnector connector = iter.next();
al.add(startTransportConnector(connector)); al.add(startTransportConnector(connector));
@ -2617,7 +2617,7 @@ public class BrokerService implements Service {
} }
this.slave = false; this.slave = false;
URI uri = getVmConnectorURI(); URI uri = getVmConnectorURI();
Map<String, String> map = new HashMap<String, String>(URISupport.parseParameters(uri)); Map<String, String> map = new HashMap<>(URISupport.parseParameters(uri));
map.put("async", "false"); map.put("async", "false");
map.put("create","false"); map.put("create","false");
uri = URISupport.createURIWithQuery(uri, URISupport.createQueryString(map)); uri = URISupport.createURIWithQuery(uri, URISupport.createQueryString(map));
@ -2742,7 +2742,7 @@ public class BrokerService implements Service {
private DestinationFilter getVirtualTopicConsumerDestinationFilter() { private DestinationFilter getVirtualTopicConsumerDestinationFilter() {
// created at startup, so no sync needed // created at startup, so no sync needed
if (virtualConsumerDestinationFilter == null) { if (virtualConsumerDestinationFilter == null) {
Set <ActiveMQQueue> consumerDestinations = new HashSet<ActiveMQQueue>(); Set <ActiveMQQueue> consumerDestinations = new HashSet<>();
if (destinationInterceptors != null) { if (destinationInterceptors != null) {
for (DestinationInterceptor interceptor : destinationInterceptors) { for (DestinationInterceptor interceptor : destinationInterceptors) {
if (interceptor instanceof VirtualDestinationInterceptor) { if (interceptor instanceof VirtualDestinationInterceptor) {