[jboss-cvs] JBoss Messaging SVN: r1551 - branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2006-11-03 01:26:37 -0500 (Fri, 03 Nov 2006)
New Revision: 1551

Modified:
   branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-519 - fixing failedNode HashMaps

Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2006-11-03 01:05:25 UTC (rev 1550)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2006-11-03 06:26:37 UTC (rev 1551)
@@ -1207,32 +1207,59 @@
    public String printBindingInformation()
    {
 
-        StringWriter buffer = new StringWriter();
-        PrintWriter out = new PrintWriter(buffer);
-        out.print(super.printBindingInformation());
+      StringWriter buffer = new StringWriter();
+      PrintWriter out = new PrintWriter(buffer);
+      out.print(super.printBindingInformation());
 
 
-        out.println("<br>Router Information");
+      out.println("<table border=1><tr><td>Node</td><td>ChannelID</td><td>Binding</td>");
 
-        for (Iterator iterRouter = routerMap.entrySet().iterator();iterRouter.hasNext();)
-        {
-            Map.Entry entry = (Map.Entry)iterRouter.next();
-            ClusterRouter router = (ClusterRouter)entry.getValue();
-            out.println("<br> queue " + entry.getKey() + " being routed to:");
-            out.println("<br>    LocalQueue = " + router.getLocalQueue());
+      for (Iterator iter = this.failedBindings.entrySet().iterator(); iter.hasNext();)
+      {
+         Map.Entry entry = (Map.Entry)iter.next();
 
-            for (Iterator queuesIterator = router.getQueues().iterator();queuesIterator.hasNext();)
+         int count=0;
+         Map bindings = (Map)entry.getValue();
+         for (Iterator iterValues = bindings.entrySet().iterator();iterValues.hasNext();)
+         {
+            Map.Entry entry2 = (Map.Entry)iterValues.next();
+            if ( count++ == 0 )
             {
-                Object queueRouted = queuesIterator.next();
-                out.println("<br>  RoutedQueue=" + queueRouted + " class=" + queueRouted.getClass().getName());
+               out.print("<tr><td>" + entry.getKey() + "</td>");
             }
+            else
+            {
+               out.print("<tr><td>&nbsp;</td>");
+            }
+            out.println("<td>" + entry2.getKey() + "</td><td>" + entry2.getValue() + "</td></tr>");
+         }
+      }
 
-        }
 
+      out.println("</table>");
 
-        return buffer.toString();
 
+      out.println("<br>Router Information");
 
+      for (Iterator iterRouter = routerMap.entrySet().iterator();iterRouter.hasNext();)
+      {
+         Map.Entry entry = (Map.Entry)iterRouter.next();
+         ClusterRouter router = (ClusterRouter)entry.getValue();
+         out.println("<br> queue " + entry.getKey() + " being routed to:");
+         out.println("<br>    LocalQueue = " + router.getLocalQueue());
+
+         for (Iterator queuesIterator = router.getQueues().iterator();queuesIterator.hasNext();)
+         {
+            Object queueRouted = queuesIterator.next();
+            out.println("<br>  RoutedQueue=" + queueRouted + " class=" + queueRouted.getClass().getName());
+         }
+
+      }
+
+
+      return buffer.toString();
+
+
    }
 
 
@@ -1260,7 +1287,7 @@
       {
          channelMap = new LinkedHashMap();
 
-         failedBindings.put(new Integer(binding.getNodeId()), failedBindings);
+         failedBindings.put(new Integer(binding.getNodeId()), channelMap);
       }
 
       channelMap.put(new Long(binding.getQueue().getChannelID()), binding);