diff --git a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/TransportConfigOperationHandlers.java b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/TransportConfigOperationHandlers.java index 918b36704ab6..9c77bd621532 100644 --- a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/TransportConfigOperationHandlers.java +++ b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/TransportConfigOperationHandlers.java @@ -369,6 +369,8 @@ static void processConnectors(final OperationContext context, final Configuratio // ARTEMIS-803 Artemis knows that is must not offset the HTTP port when it is used by colocated backups parameters.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true); parameters.put(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME, HTTPConnectorDefinition.ENDPOINT.resolveModelAttribute(context, config).asString()); + // WFLY-9096 support TLSv1.x on IBM Java by default (default for Oracle Java) + parameters.putIfAbsent(TransportConstants.ENABLED_PROTOCOLS_PROP_NAME, "TLSv1,TLSv1.1,TLSv1.2"); // uses the parameters to pass the socket binding name that will be read in ActiveMQServerService.start() parameters.put(HTTPConnectorDefinition.SOCKET_BINDING.getName(), binding); ModelNode serverNameModelNode = HTTPConnectorDefinition.SERVER_NAME.resolveModelAttribute(context, config); diff --git a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/ExternalPooledConnectionFactoryService.java b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/ExternalPooledConnectionFactoryService.java index 4eefb89c644f..2336a124819d 100644 --- a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/ExternalPooledConnectionFactoryService.java +++ b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/ExternalPooledConnectionFactoryService.java @@ -321,7 +321,7 @@ private void createService(ServiceTarget serviceTarget, ServiceContainer contain if (multiple) { connectorParams.append(";"); } - connectorParams.append(entry.getKey()).append("=").append(entry.getValue()); + connectorParams.append(entry.getKey()).append("=").append(String.valueOf(entry.getValue()).replace(",", "\\,")); multiple = true; } } diff --git a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryService.java b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryService.java index 5c21cf13044f..b8a816625ef0 100644 --- a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryService.java +++ b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryService.java @@ -362,7 +362,7 @@ private void createService(ServiceTarget serviceTarget, ServiceContainer contain if (multiple) { connectorParams.append(";"); } - connectorParams.append(entry.getKey()).append("=").append(entry.getValue()); + connectorParams.append(entry.getKey()).append("=").append(String.valueOf(entry.getValue()).replace(",", "\\,")); multiple = true; } }