Fix with getting connectionInfo from operation service node

(cherry picked from commit bb05224)
kaaproject · Apr 27, 2017 · 637b42b · 637b42b
1 parent e5d5b3e
commit 637b42b
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.../java/org/kaaproject/kaa/server/bootstrap/service/DefaultOperationsServerListService.java b/.../java/org/kaaproject/kaa/server/bootstrap/service/DefaultOperationsServerListService.java
@@ -149,27 +149,30 @@ protected Set<ProtocolConnectionData> filterProtocolInstances(List<ProtocolVersi
         for (TransportMetaData md : node.getTransports()) {
           if (md.getId() == key.getProtocolId() && md.getMinSupportedVersion() <= key.getVersion()
               && key.getVersion() <= md.getMaxSupportedVersion()) {
-            result.add(toProtocolConnectionData(node, md, key.getVersion()));
+            result.addAll(toProtocolConnectionData(node, md, key.getVersion()));
           }
         }
       }
     }
     return result;
   }
 
-  private ProtocolConnectionData toProtocolConnectionData(OperationsNodeInfo node,
+  private Set<ProtocolConnectionData> toProtocolConnectionData(OperationsNodeInfo node,
-                                                          TransportMetaData md,
+                                                               TransportMetaData md,
-                                                          int version) {
+                                                               int version) {
     byte[] connectionData = null;
+    Set<ProtocolConnectionData> result = new HashSet<>();
     for (VersionConnectionInfoPair pair : md.getConnectionInfo()) {
       if (version == pair.getVersion()) {
-        connectionData = pair.getConenctionInfo().array();
+        result.add(new ProtocolConnectionData(ServerNameUtil.crc32(node.getConnectionInfo()),
+            new ProtocolVersionId(md.getId(), version),
+            pair.getConenctionInfo().array())
+        );
+
       }
     }
-    return new ProtocolConnectionData(
+
-        ServerNameUtil.crc32(node.getConnectionInfo()),
+    return result;
-        new ProtocolVersionId(md.getId(), version),
-        connectionData);
   }