[jboss-cvs] JBoss Messaging SVN: r8639 - in branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954: src/main/org/jboss/messaging/core/impl/postoffice and 1 other directory.

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

Author: raggz
Date: 2015-09-15 04:21:29 -0400 (Tue, 15 Sep 2015)
New Revision: 8639

Modified:
   branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/
   branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
Added JBMESSAGING-1914


Property changes on: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_1_4:8481,8631
/branches/JBM1842:8169-8232
   + /branches/Branch_1_4:8481,8502,8631
/branches/JBM1842:8169-8232

Modified: branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2015-09-08 09:55:02 UTC (rev 8638)
+++ branches/JBossMessaging_1_4_8_SP5_JBMESSAGING-1911_JBMESSAGING-1912_JBMESSAGING-1914_JBMESSAGING-1918_JBMESSAGING_1921_JBMESSAGING_1922_JBMESSAGING_1954/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2015-09-15 08:21:29 UTC (rev 8639)
@@ -725,7 +725,7 @@
          {
             PreparedStatement ps1  = null;
             PreparedStatement ps2  = null;
-
+            ResultSet res = null;
             try
             {
                //writing timestamp
@@ -752,7 +752,7 @@
                   // collect states
                   ps2 = conn.prepareStatement(getSQLStatement("LOAD_CLUSTER_STATE"));
                   
-                  ResultSet res = ps2.executeQuery();
+                  res = ps2.executeQuery();
 
                   while (res.next())
                   {
@@ -771,6 +771,7 @@
             finally
             {
                closeStatement(ps1);
+               closeResultSet(res);
                closeStatement(ps2);
             }
             return null;