[jboss-cvs] JBoss Messaging SVN: r8214 - branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice.

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

Author: gaohoward
Date: 2011-02-06 04:53:37 -0500 (Sun, 06 Feb 2011)
New Revision: 8214

Modified:
   branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
correct compilation error


Modified: branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2011-02-06 09:51:47 UTC (rev 8213)
+++ branches/port1842/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2011-02-06 09:53:37 UTC (rev 8214)
@@ -721,13 +721,13 @@
                      clusterState.clear();
                      // collect states
                      ps = conn.prepareStatement(getSQLStatement("LOAD_CLUSTER_STATE"));
-                     ResultSet result = ps.executeQuery();
+                     ResultSet res = ps.executeQuery();
    
-                     while (result.next())
+                     while (res.next())
                      {
-                        int nodeID = result.getInt(1);
-                        long timestamp = result.getLong(2);
-                        int nodeState = result.getInt(3);
+                        int nodeID = res.getInt(1);
+                        long timestamp = res.getLong(2);
+                        int nodeState = res.getInt(3);
    
                         clusterState.addNode(nodeID, timestamp, nodeState);
                         log.debug("Added cluster node state: nodeID = " + nodeID + ", timestamp = " + timestamp + ", nodeState = " + nodeState);