[Java] Avoid allocation for empty cluster members list and increase A…

…eron version.
xg86 · Dec 16, 2019 · 297a260 · 297a260
1 parent 3583fe1
commit 297a260
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ClusterMember.java b/aeron-cluster/src/main/java/io/aeron/cluster/ClusterMember.java
@@ -566,6 +566,11 @@ public static ClusterMember parseEndpoints(final int id, final String endpointsD
      */
     public static String encodeAsString(final ClusterMember[] clusterMembers)
     {
+        if (0 == clusterMembers.length)
+        {
+            return "";
+        }
+
         final StringBuilder builder = new StringBuilder();
 
         for (int i = 0, length = clusterMembers.length; i < length; i++)

diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java b/aeron-cluster/src/main/java/io/aeron/cluster/ConsensusModuleAgent.java
@@ -778,9 +778,9 @@ public void onRemoveMember(final long correlationId, final int memberId, final b
         }
     }
 
-    public void onClusterMembersQuery(final long correlationId, final boolean returnExtended)
+    public void onClusterMembersQuery(final long correlationId, final boolean isExtendedRequest)
     {
-        if (returnExtended)
+        if (isExtendedRequest)
         {
             serviceProxy.clusterMembersExtendedResponse(
                 correlationId, timeNs, leaderMember.id(), memberId, clusterMembers, passiveMembers);

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.24.1-SNAPSHOT
+1.25.0-SNAPSHOT