Rework commit to make diff clearer

src/java/org/jivesoftware/openfire/admin/JDBCAdminProvider.java

@@ -116,19 +116,30 @@ public class JDBCAdminProvider implements AdminProvider {
 
         List<JID> jids = new ArrayList<>();
         synchronized (getAdminsSQL) {
-            try {
-                con = getConnection();
-                pstmt = con.prepareStatement(getAdminsSQL);
-                rs = pstmt.executeQuery();
-                while (rs.next()) {
-                    String name = rs.getString(1);
-                    jids.add(new JID(name + "@" + xmppDomain));
+        try {
+            con = getConnection();
+            pstmt = con.prepareStatement(getAdminsSQL);
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                String name = rs.getString(1);
+                jids.add(new JID(name + "@" + xmppDomain));
+            }
+            return jids;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        } finally {
+            DbConnectionManager.closeConnection(rs, pstmt, con);
+        }
+        }
+    }
+
+    private void changeAdmins(final Connection con, final String sql, final List<JID> admins) throws SQLException {
+        if (!admins.isEmpty()) {
+            try (final PreparedStatement pstmt = con.prepareStatement(sql)) {
+                for (final JID jid : admins) {
+                    pstmt.setString(1, jid.getNode());
+                    pstmt.execute();
                 }
-                return jids;
-            } catch (SQLException e) {
-                throw new RuntimeException(e);
-            } finally {
-                DbConnectionManager.closeConnection(rs, pstmt, con);
             }
         }
     }
@@ -156,17 +167,6 @@ public class JDBCAdminProvider implements AdminProvider {
         }
     }
 
-    private void changeAdmins(final Connection con, final String sql, final List<JID> admins) throws SQLException {
-        if (!admins.isEmpty()) {
-            try (final PreparedStatement pstmt = con.prepareStatement(sql)) {
-                for (final JID jid : admins) {
-                    pstmt.setString(1, jid.getNode());
-                    pstmt.execute();
-                }
-            }
-        }
-    }
-
     @Override
     public boolean isReadOnly() {
         return insertAdminsSQL.isEmpty() || deleteAdminsSQL.isEmpty();