Do not close an already closed statement. This may trigger an error when using...

Do not close an already closed statement. This may trigger an error when using Sybase jdbc driver. JM-570

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3479 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/group/DefaultGroupProvider.java

@@ -12,8 +12,8 @@
 package org.jivesoftware.wildfire.group;
 
 import org.jivesoftware.database.DbConnectionManager;
-import org.jivesoftware.wildfire.XMPPServer;
 import org.jivesoftware.util.Log;
+import org.jivesoftware.wildfire.XMPPServer;
 import org.xmpp.packet.JID;
 
 import java.sql.Connection;
@@ -198,7 +198,6 @@ public class DefaultGroupProvider implements GroupProvider {
             pstmt = con.prepareStatement(DELETE_GROUP);
             pstmt.setString(1, groupName);
             pstmt.executeUpdate();
-            pstmt.close();
         }
         catch (SQLException e) {
             Log.error(e);

src/java/org/jivesoftware/wildfire/muc/spi/MUCPersistenceManager.java

@@ -11,19 +11,19 @@
 
 package org.jivesoftware.wildfire.muc.spi;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.*;
-
 import org.jivesoftware.database.DbConnectionManager;
+import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
+import org.jivesoftware.wildfire.PacketRouter;
 import org.jivesoftware.wildfire.muc.MUCRole;
 import org.jivesoftware.wildfire.muc.MUCRoom;
 import org.jivesoftware.wildfire.muc.MultiUserChatServer;
-import org.jivesoftware.wildfire.PacketRouter;
-import org.jivesoftware.util.Log;
-import org.jivesoftware.util.StringUtils;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
 
 /**
  * A manager responsible for ensuring room persistence. There are different ways to make a room 
@@ -126,7 +126,6 @@ public class MUCPersistenceManager {
                 answer = rs.getString(1);
             }
             rs.close();
-            pstmt.close();
         }
         catch (SQLException sqle) {
             Log.error(sqle);

src/java/org/jivesoftware/wildfire/roster/RosterItemProvider.java

@@ -304,6 +304,9 @@ public class RosterItemProvider {
             // Close the statement and result set
             pstmt.close();
             rs.close();
+            // Set null to pstmt to be sure that it's not closed twice. It seems that
+            // Sybase driver is raising an error when trying to close an alrady closed statement.
+            pstmt = null;
 
             // Load the groups for the loaded contact
             for (RosterItem item : itemList) {