| commit | cc877e2b33e97eedf81ff7bb03a542e5e7de5167 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Onofré <jbonofre@apache.org> | Wed Jun 22 07:51:59 2016 +0200 |
| committer | Jean-Baptiste Onofré <jbonofre@apache.org> | Wed Jun 22 07:51:59 2016 +0200 |
| tree | 2d7c82638aaf6c2a6f849efa79bebb518bbc8b9e | |
| parent | dee8c4226bc8f9d117258fcd8edcec4e423b2f66 [diff] | |
| parent | 176a7f2d78529b4cdb314005a541cae4cc619109 [diff] |
Merge branch 'fix-discovered-members-property' of https://github.com/3cky/karaf-cellar
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java b/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java index ce16744..95c6040 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
@@ -19,7 +19,6 @@ public class Discovery { public static final String PID = "org.apache.karaf.cellar.discovery"; - public static final String MEMBERS_PROPERTY_NAME = "tcpIpMembers"; public static final String DISCOVERED_MEMBERS_PROPERTY_NAME = "discoveredMembers"; public static final String INTERVAL = "interval";
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java index c3f0b41..b50cc6e 100644 --- a/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java +++ b/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
@@ -70,7 +70,7 @@ properties = new Hashtable(); } String newMemberText = CellarUtils.createStringFromSet(members, true); - String memberText = (String) properties.get(Discovery.MEMBERS_PROPERTY_NAME); + String memberText = (String) properties.get(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME); if (newMemberText != null && newMemberText.length() > 0 && !newMemberText.equals(memberText)) { properties.put(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME, newMemberText); LOGGER.trace("CELLAR DISCOVERY: adding a new member {} to configuration and updating it", newMemberText);