treat empty username and password as "anonymous" login

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
eclipse-ditto · Sep 12, 2018 · e7b31a0 · e7b31a0
1 parent 45eb6c2
commit e7b31a0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...lipse/ditto/services/connectivity/messaging/amqp/ConnectionBasedJmsConnectionFactory.java b/...lipse/ditto/services/connectivity/messaging/amqp/ConnectionBasedJmsConnectionFactory.java
@@ -99,8 +99,8 @@ public static String buildAmqpConnectionUriFromConnection(final Connection conne
 
         final String baseUri = formatUri(protocol, hostname, port);
 
-        final List<String> parameters =
-                new ArrayList<>(getAmqpParameters(username == null || password == null, specificConfig));
+        final boolean anonymous = username == null || username.isEmpty() || password == null || password.isEmpty();
+        final List<String> parameters = new ArrayList<>(getAmqpParameters(anonymous, specificConfig));
         final boolean securedConnection =
                 !connection.isValidateCertificates() && SECURE_AMQP_SCHEME.equalsIgnoreCase(protocol);
         parameters.addAll(getTransportParameters(securedConnection, specificConfig));
@@ -142,7 +142,7 @@ private static List<String> getJmsParameters(final String id, @Nullable final St
                 .collect(Collectors.toList());
 
         jmsParams.add("jms.clientID=" + encodedId);
-        if (username != null && password != null) {
+        if (username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
             jmsParams.add("jms.username=" + username);
             jmsParams.add("jms.password=" + password);
         }