This is an automated email from the ASF dual-hosted git repository. michaelpearce pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 3e87249d7565c6e40a4e2e3c34651f064c4dad81 Author: Jiri Danek <[email protected]> AuthorDate: Fri Apr 26 15:23:03 2019 +0200 ARTEMIS-2320 Overwritten Map key or Set element --- .../src/main/java/org/apache/activemq/artemis/cli/commands/Create.java | 1 - .../tests/integration/amqp/AmqpFailoverEndpointDiscoveryTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 38dd3de..10010fa 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -592,7 +592,6 @@ public class Create extends InputAbstract { filters.put("${extra.web.attributes}", ""); } filters.put("${fsync}", String.valueOf(!noJournalSync)); - filters.put("${user}", System.getProperty("user.name", "")); filters.put("${default.port}", String.valueOf(defaultPort + portOffset)); filters.put("${amqp.port}", String.valueOf(AMQP_PORT + portOffset)); filters.put("${stomp.port}", String.valueOf(STOMP_PORT + portOffset)); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFailoverEndpointDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFailoverEndpointDiscoveryTest.java index 81c2885..5ded6f2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFailoverEndpointDiscoveryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpFailoverEndpointDiscoveryTest.java @@ -119,7 +119,6 @@ public class AmqpFailoverEndpointDiscoveryTest extends FailoverTestBase { private TransportConfiguration getNettyConnectorTransportConfig(final boolean live) { Map<String, Object> server1Params = new HashMap<>(); if (protocol == 1) { - server1Params.put(TransportConstants.SSL_ENABLED_PROP_NAME, "true"); server1Params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true); server1Params.put(TransportConstants.TRUSTSTORE_PATH_PROP_NAME, "client-side-truststore.jks"); server1Params.put(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, "secureexample");
