Issue eclipse-ditto#878: Use connection ID as client ID if the connec…

…tion has 1 client. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
bosch-io · Nov 30, 2020 · a3cfd91 · a3cfd91
1 parent e7d5e2c
commit a3cfd91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/BaseClientActor.java b/...ging/src/main/java/org/eclipse/ditto/services/connectivity/messaging/BaseClientActor.java
@@ -341,7 +341,11 @@ public void onConnectivityConfigModified(final ConnectivityConfig modifiedConfig
      * @return the client ID.
      */
     protected String getClientId(final CharSequence prefix) {
-        return prefix + "-" + actorUUID;
+        if (connection.getClientCount() == 1) {
+            return prefix.toString();
+        } else {
+            return prefix + "-" + actorUUID;
+        }
     }
 
     private boolean hasInboundMapperConfigChanged(final ConnectivityConfig connectivityConfig) {

diff --git a/...rg/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/AbstractMqttClientActor.java b/...rg/eclipse/ditto/services/connectivity/messaging/mqtt/hivemq/AbstractMqttClientActor.java
@@ -488,7 +488,7 @@ private AbstractMqttSubscriptionHandler<S, P, R> getSubscriptionHandler() {
     }
 
     private String distinguishClientIdIfNecessary(final String configuredClientId) {
-        if (connection.getClientCount() == 1 || configuredClientId.isEmpty()) {
+        if (configuredClientId.isEmpty()) {
             return configuredClientId;
         } else {
             return getClientId(configuredClientId);