pgoldstein    2002/11/26 22:16:49

  Modified:    src/java/org/apache/james/userrepository
                        AbstractJdbcUsersRepository.java
  Log:
  Updated the AbstractJdbcUsersRepository to include proper closing of the prepared 
statement
  Thanks to Noel.
  Submitting after a vote to break code freeze.
  
  Revision  Changes    Path
  1.14      +6 -3      
jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
  
  Index: AbstractJdbcUsersRepository.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractJdbcUsersRepository.java  4 Oct 2002 08:17:49 -0000       1.13
  +++ AbstractJdbcUsersRepository.java  27 Nov 2002 06:16:49 -0000      1.14
  @@ -476,15 +476,16 @@
           // Always get the user via case-insensitive SQL,
           // then check case if necessary.
           Connection conn = openConnection();
  +        PreparedStatement getUsersStatement = null;
  +        ResultSet rsUsers = null;
           try {
               // Get a ResultSet containing all users.
               String sql = m_userByNameCaseInsensitiveSql;
  -            PreparedStatement getUsersStatement = 
  -                conn.prepareStatement(sql);
  +            getUsersStatement = conn.prepareStatement(sql);
   
               getUsersStatement.setString(1, name.toLowerCase(Locale.US));
   
  -            ResultSet rsUsers = getUsersStatement.executeQuery();
  +            rsUsers = getUsersStatement.executeQuery();
   
               // For case-insensitive matching, the first matching user will be 
returned.
               User user = null;
  @@ -505,6 +506,8 @@
               throw new CascadingRuntimeException("Error accessing database", sqlExc);
           }
           finally {
  +            theJDBCUtil.closeJDBCResultSet(rsUsers);
  +            theJDBCUtil.closeJDBCStatement(getUsersStatement);
               theJDBCUtil.closeJDBCConnection(conn);
           }
       }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to