You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/05/18 17:45:17 UTC

[3/4] activemq-artemis git commit: Fix typos and string concat in Topology

Fix typos and string concat in Topology


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/545e67fc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/545e67fc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/545e67fc

Branch: refs/heads/master
Commit: 545e67fc9675ebb24d559e88386408c15f0adc16
Parents: 3c6e213
Author: Thiago Kronig <ca...@uolinc.com>
Authored: Wed May 13 20:50:30 2015 -0300
Committer: Thiago Kronig <th...@gmail.com>
Committed: Thu May 14 18:26:05 2015 -0300

----------------------------------------------------------------------
 .../activemq/artemis/core/client/impl/Topology.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/545e67fc/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
index 34b44b9..f6ed696 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/Topology.java
@@ -258,7 +258,7 @@ public final class Topology
             return true;
          }
          /*
-          * always add the backup, better to try to reconnect to something thats not there then to
+          * always add the backup, better to try to reconnect to something that's not there then to
           * not know about it at all
           */
          if (currentMember.getBackup() == null && memberInput.getBackup() != null)
@@ -322,7 +322,7 @@ public final class Topology
       ArrayList<ClusterTopologyListener> listenersCopy;
       synchronized (topologyListeners)
       {
-         listenersCopy = new ArrayList<ClusterTopologyListener>(topologyListeners);
+         listenersCopy = new ArrayList<>(topologyListeners);
       }
       return listenersCopy;
    }
@@ -454,7 +454,7 @@ public final class Topology
       ArrayList<TopologyMemberImpl> members;
       synchronized (this)
       {
-         members = new ArrayList<TopologyMemberImpl>(topology.values());
+         members = new ArrayList<>(topology.values());
       }
       return members;
    }
@@ -484,11 +484,11 @@ public final class Topology
    private synchronized String describe(final String text)
    {
       StringBuilder desc = new StringBuilder(text + "topology on " + this + ":\n");
-      for (Entry<String, TopologyMemberImpl> entry : new HashMap<String, TopologyMemberImpl>(topology).entrySet())
+      for (Entry<String, TopologyMemberImpl> entry : new HashMap<>(topology).entrySet())
       {
-         desc.append("\t" + entry.getKey() + " => " + entry.getValue() + "\n");
+         desc.append("\t").append(entry.getKey()).append(" => ").append(entry.getValue()).append("\n");
       }
-      desc.append("\t" + "nodes=" + nodes() + "\t" + "members=" + members());
+      desc.append("\t" + "nodes=").append(nodes()).append("\t").append("members=").append(members());
       if (topology.isEmpty())
       {
          desc.append("\tEmpty");
@@ -535,7 +535,7 @@ public final class Topology
    {
       if (mapDelete == null)
       {
-         mapDelete = new ConcurrentHashMap<String, Long>();
+         mapDelete = new ConcurrentHashMap<>();
       }
       return mapDelete;
    }