From 01c2c9975f3a0c33c1c211783c228c55b4aa3a46 Mon Sep 17 00:00:00 2001 From: Alissa Bonas Date: Tue, 24 Dec 2013 13:44:24 +0200 Subject: [PATCH 1/1] fix typos and some Java improvements in ClusterManager Fix typos in error messages, use StringBuilder instead of StringBuffer, append strings more efficiently, and move a local variable to be a constant. Change-Id: I23a4436449909cf02a6fce47e0f1f9a0ce80f0e4 Signed-off-by: Alissa Bonas --- .../internal/ClusterManager.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java index 65e7720dd3..83db414400 100644 --- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java +++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java @@ -69,7 +69,7 @@ public class ClusterManager implements IClusterServices { private ViewChangedListener cacheManagerListener; private static String loopbackAddress = InetAddress.getLoopbackAddress().getHostAddress(); - + private static final int gossipRouterPortDefault = 12001; // defaultTransactionTimeout is 60 seconds private static int DEFAULT_TRANSACTION_TIMEOUT = 60; @@ -91,12 +91,11 @@ public class ClusterManager implements IClusterServices { */ private GossipRouter startGossiper() { boolean amIGossipRouter = false; - Integer gossipRouterPortDefault = 12001; Integer gossipRouterPort = gossipRouterPortDefault; InetAddress gossipRouterAddress = null; String supernodes_list = System.getProperty("supernodes", loopbackAddress); - StringBuffer sanitized_supernodes_list = new StringBuffer(); + StringBuilder sanitized_supernodes_list = new StringBuilder(); List myAddresses = new ArrayList(); StringTokenizer supernodes = new StringTokenizer(supernodes_list, ":"); @@ -135,7 +134,7 @@ public class ClusterManager implements IClusterServices { try { hostAddr = InetAddress.getByName(host); } catch (UnknownHostException ue) { - logger.error("Host not known"); + logger.error("Host {} is not known", host); continue; } if (host_port.hasMoreTokens()) { @@ -143,13 +142,12 @@ public class ClusterManager implements IClusterServices { try { port_num = Integer.valueOf(port); } catch (NumberFormatException ne) { - logger - .error("Supplied supernode gossiepr port is not recognized, using standard gossipport"); + logger.error("Supplied supernode gossip port is not recognized, using default gossip port {}", + gossipRouterPortDefault); port_num = gossipRouterPortDefault; } if ((port_num > 65535) || (port_num < 0)) { - logger - .error("Supplied supernode gossip port is outside a valid TCP port range"); + logger.error("Supplied supernode gossip port is outside a valid TCP port range"); port_num = gossipRouterPortDefault; } } @@ -168,8 +166,7 @@ public class ClusterManager implements IClusterServices { if (!sanitized_supernodes_list.toString().equals("")) { sanitized_supernodes_list.append(","); } - sanitized_supernodes_list.append(hostAddr.getHostAddress() + "[" - + port_num + "]"); + sanitized_supernodes_list.append(hostAddr.getHostAddress()).append("[").append(port_num).append("]"); } if (amIGossipRouter) { -- 2.36.6