You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by se...@apache.org on 2001/11/01 17:05:33 UTC

cvs commit: jakarta-james/src/java/org/apache/james/transport/mailets JDBCAlias.java

serge       01/11/01 08:05:33

  Modified:    src/java/org/apache/james/transport/mailets JDBCAlias.java
  Log:
  Fixed stupid bug that had source and target columns backwards.  Also moved to reuse single PreparedStatement object instead of recreating each time.
  
  Revision  Changes    Path
  1.4       +9 -4      jakarta-james/src/java/org/apache/james/transport/mailets/JDBCAlias.java
  
  Index: JDBCAlias.java
  ===================================================================
  RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/JDBCAlias.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDBCAlias.java	2001/10/31 21:29:33	1.3
  +++ JDBCAlias.java	2001/11/01 16:05:33	1.4
  @@ -73,9 +73,9 @@
               }
   
               //Build the query
  -            query = "SELECT " + getInitParameter("source_column")
  +            query = "SELECT " + getInitParameter("target_column")
                       + " FROM " + tableName + " WHERE "
  -                    + getInitParameter("target_column") + " = ?";
  +                    + getInitParameter("source_column") + " = ?";
           } catch (MailetException me) {
               throw me;
           } catch (Exception e) {
  @@ -103,11 +103,12 @@
           Collection recipientsToAdd = new Vector();
           try {
               conn = getConnection();
  +            mappingStmt = conn.prepareStatement(query);
   
  +
               for (Iterator i = recipients.iterator(); i.hasNext(); ) {
                   try {
                       MailAddress source = (MailAddress)i.next();
  -                    mappingStmt = conn.prepareStatement(query);
                       mappingStmt.setString(1, source.toString());
                       mappingRS = mappingStmt.executeQuery();
                       if (!mappingRS.next()) {
  @@ -128,12 +129,16 @@
                       }
                   } finally {
                       mappingRS.close();
  -                    mappingStmt.close();
                   }
               }
           } catch (SQLException sqle) {
               throw new MessagingException("Error accessing database", sqle);
           } finally {
  +            try {
  +                mappingStmt.close();
  +            } catch (Exception e) {
  +                //ignore
  +            }
               try {
                   conn.close();
               } catch (Exception e) {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>