From 11acf2180f04550609b6aeaabee06bf9b877f2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 10 Apr 2016 19:34:22 +0300 Subject: [PATCH] Avoid unnecessary empty array creation --- .../artemis/jms/management/impl/JMSServerControlImpl.java | 2 +- .../java/org/apache/activemq/artemis/osgi/OsgiBroker.java | 2 +- .../artemis/core/management/impl/BridgeControlImpl.java | 5 ++++- .../core/management/impl/ClusterConnectionControlImpl.java | 5 +++-- .../artemis/core/management/impl/MBeanInfoHelper.java | 2 +- .../artemis/core/remoting/impl/netty/NettyAcceptor.java | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java index f464251817..b2627245c4 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java @@ -777,7 +777,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo destinations.add(control.getAddress()); } } - return destinations.toArray(new String[0]); + return destinations.toArray(new String[destinations.size()]); } @Override diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java index f2a30f32de..d6bfcb8b8e 100644 --- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java +++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java @@ -143,7 +143,7 @@ public class OsgiBroker { protocols.add(protoName); } } - return protocols.toArray(new String[]{}); + return protocols.toArray(new String[protocols.size()]); } @Deactivate diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java index 053c19b82a..9c2b45e7a2 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java @@ -23,6 +23,8 @@ import org.apache.activemq.artemis.core.config.BridgeConfiguration; import org.apache.activemq.artemis.core.persistence.StorageManager; import org.apache.activemq.artemis.core.server.cluster.Bridge; +import java.util.List; + public class BridgeControlImpl extends AbstractControl implements BridgeControl { // Constants ----------------------------------------------------- @@ -51,7 +53,8 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl public String[] getStaticConnectors() throws Exception { clearIO(); try { - return configuration.getStaticConnectors().toArray(new String[0]); + List staticConnectors = configuration.getStaticConnectors(); + return staticConnectors.toArray(new String[staticConnectors.size()]); } finally { blockOnIO(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java index 9d726f9f39..e344e14497 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java @@ -125,11 +125,12 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu public String[] getStaticConnectors() { clearIO(); try { - if (configuration.getStaticConnectors() == null) { + List staticConnectors = configuration.getStaticConnectors(); + if (staticConnectors == null) { return null; } else { - return configuration.getStaticConnectors().toArray(new String[0]); + return staticConnectors.toArray(new String[staticConnectors.size()]); } } finally { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java index 72a439a202..f0ded4e8c4 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java @@ -48,7 +48,7 @@ public class MBeanInfoHelper { } } - return operations.toArray(new MBeanOperationInfo[0]); + return operations.toArray(new MBeanOperationInfo[operations.size()]); } // Package protected --------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java index 34cc8cfe18..3da612f226 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java @@ -358,7 +358,7 @@ public class NettyAcceptor extends AbstractAcceptor { set.add(s); } warningPrinted.set(true); - engine.setEnabledProtocols(set.toArray(new String[0])); + engine.setEnabledProtocols(set.toArray(new String[set.size()])); SslHandler handler = new SslHandler(engine);