Merge pull request #11673 from hkalina/WFLY-9096

[WFLY-9096] support TLSv1.x in http-connector on IBM Java
wildfly · Sep 24, 2018 · d00a855 · d00a855
2 parents 2c6c02e + d13b4f4
commit d00a855
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.../main/java/org/wildfly/extension/messaging/activemq/TransportConfigOperationHandlers.java b/.../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/.../org/wildfly/extension/messaging/activemq/jms/ExternalPooledConnectionFactoryService.java b/.../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/...ain/java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryService.java b/...ain/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;
                 }
             }