/src/edu/ucsb/nceas/metacat/AccessionNumber.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 9491

Added by Jing Tao over 8 years ago

Close the result and connection in the finally clause to make sure they being closed.

         boolean hasAccNumber = false;
         DBConnection conn = null;
         int serialNumber = -1;
         PreparedStatement pstmt = null;
         ResultSet rs = null;
         try {
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.accNumberUsed");
           serialNumber=conn.getCheckOutSerialNumber();
-...
           pstmt.setString(1,accNumber);
           pstmt.setString(2,accNumber);
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           rs = pstmt.getResultSet();
           hasAccNumber = rs.next();
           pstmt.close();
           //pstmt.close();
         } catch (SQLException e) {
           throw new SQLException
-...
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn, serialNumber);
            try {
                if(rs != null) {
                    rs.close();
+               }
                if(pstmt != null) {
                    pstmt.close();
+               }
            } finally {
                DBConnectionPool.returnDBConnection(conn, serialNumber);
+           }
+        }
         return hasAccNumber;
-...
         boolean hasCurrentAccNumber = false;
         DBConnection conn = null;
         int serialNumber = -1;
         ResultSet rs = null;
         PreparedStatement pstmt = null;
         try {
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.accNumberIsCurre");
           serialNumber=conn.getCheckOutSerialNumber();
-...
                     "WHERE docid = ?");
           pstmt.setString(1, accNumber);
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           rs = pstmt.getResultSet();
           hasCurrentAccNumber = rs.next();
           if(!hasCurrentAccNumber)
+          {
-...
             rs = pstmt.getResultSet();
             hasCurrentAccNumber = rs.next();
+          }
           pstmt.close();
           //pstmt.close();
         } catch (SQLException e) {
           throw new SQLException(
-...
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn, serialNumber);
            try {
                if(rs != null) {
                    rs.close();
+               }
                if(pstmt != null) {
                    pstmt.close();
+               }
            } finally {
                DBConnectionPool.returnDBConnection(conn, serialNumber);
+           }
+        }
         return hasCurrentAccNumber;
-...
         String rev = "";
         DBConnection conn = null;
         int serialNumber = -1;
         PreparedStatement pstmt = null;
         ResultSet rs = null;
         try {
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.getLastRevision");
           serialNumber=conn.getCheckOutSerialNumber();
-...
           pstmt.setString(1, docid);
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           rs = pstmt.getResultSet();
           boolean hasRow = rs.next();
           rev = rs.getString(1);
           pstmt.close();
           //pstmt.close();
         } catch (SQLException e) {
           throw new SQLException(
-...
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn,serialNumber);
             try {
                 if(rs != null) {
                     rs.close();
+                }
                 if(pstmt != null) {
                     pstmt.close();
+                }
             } finally {
                 DBConnectionPool.returnDBConnection(conn,serialNumber);
+            }
+        }
         return rev;
-...
         int rev = 1;
         DBConnection conn =null;
         int serialNumber = -1;
         PreparedStatement pStmt = null;
         ResultSet rs = null;
         try {
           PreparedStatement pStmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.getLastRevisionN");
           serialNumber=conn.getCheckOutSerialNumber();
-...
           pStmt.setString(1, docId);
           pStmt.execute();
           ResultSet rs = pStmt.getResultSet();
           rs = pStmt.getResultSet();
           boolean hasRow = rs.next();
           if(hasRow)
+          {
             rev = rs.getInt(1);
+          }
           pStmt.close();
           //pStmt.close();
         } catch (SQLException e) {
           throw new SQLException(
-...
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn,serialNumber);
             try {
                 if(rs != null) {
                     rs.close();
+                }
                 if(pStmt != null) {
                     pStmt.close();
+                }
             } finally {
                 DBConnectionPool.returnDBConnection(conn,serialNumber);
+            }
+        }
         return rev;
+      }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 9491

Added by Jing Tao over 8 years ago