5:53 a.m.
Author: clebert.suconic(a)jboss.com
Date: 2011-08-25 23:53:29 -0400 (Thu, 25 Aug 2011)
New Revision: 11229
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
Log:
re-enabling back-of until I can figure out how to avoid it on Topology
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-08-26
03:16:31 UTC (rev 11228)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-08-26
03:53:29 UTC (rev 11229)
@@ -36,8 +36,7 @@
public class Topology implements Serializable
{
- // TODO: remove the backof from this class. It's probably not needed any longer
- // private static final int BACKOF_TIMEOUT = 500;
+ private static final int BACKOF_TIMEOUT = 500;
private static final long serialVersionUID = -9037171688692471371L;
@@ -45,7 +44,7 @@
private static final Logger log = Logger.getLogger(Topology.class);
- // private transient HashMap<String, Pair<Long, Integer>> mapBackof = new
HashMap<String, Pair<Long, Integer>>();
+ private transient HashMap<String, Pair<Long, Integer>> mapBackof = new
HashMap<String, Pair<Long, Integer>>();
private Executor executor = null;
@@ -113,10 +112,10 @@
if (currentMember == null)
{
- /*if (!testBackof(nodeId))
+ if (!testBackof(nodeId))
{
return false;
- } */
+ }
if (Topology.log.isDebugEnabled())
{
@@ -144,20 +143,20 @@
if (hasChanged("a", memberToSend.getConnector().a,
memberInput.getConnector().a))
{
- /*if (!replaced && !testBackof(nodeId))
+ if (!replaced && !testBackof(nodeId))
{
return false;
- }*/
+ }
memberToSend = new TopologyMember(memberInput.getConnector().a,
memberToSend.getConnector().b);
replaced = true;
}
if (hasChanged("b", memberToSend.getConnector().b,
memberInput.getConnector().b))
{
- /*if (!replaced && !testBackof(nodeId))
+ if (!replaced && !testBackof(nodeId))
{
return false;
- }*/
+ }
memberToSend = new TopologyMember(memberToSend.getConnector().a,
memberInput.getConnector().b);
replaced = true;
}
@@ -228,7 +227,7 @@
* @param nodeId
* @param backOfData
*/
- /*private boolean testBackof(final String nodeId)
+ private boolean testBackof(final String nodeId)
{
Pair<Long, Integer> backOfData = mapBackof.get(nodeId);
@@ -262,7 +261,7 @@
}
return true;
- } */
+ }
/**
* @return
@@ -283,21 +282,21 @@
synchronized (this)
{
-// Pair<Long, Integer> value = mapBackof.get(nodeId);
-//
-// if (value == null)
-// {
-// value = new Pair<Long, Integer>(0l, 0);
-// mapBackof.put(nodeId, value);
-// }
-//
-// value.a = System.currentTimeMillis();
-//
-// if (System.currentTimeMillis() - value.a > BACKOF_TIMEOUT)
-// {
-// value.b = 0;
-// }
+ Pair<Long, Integer> value = mapBackof.get(nodeId);
+ if (value == null)
+ {
+ value = new Pair<Long, Integer>(0l, 0);
+ mapBackof.put(nodeId, value);
+ }
+
+ value.a = System.currentTimeMillis();
+
+ if (System.currentTimeMillis() - value.a > BACKOF_TIMEOUT)
+ {
+ value.b = 0;
+ }
+
member = mapTopology.remove(nodeId);
}