tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session JDBCStore.java LocalStrings.properties
Date Mon, 15 Nov 2004 22:14:57 GMT
markt       2004/11/15 14:14:57

  Modified:    catalina/src/share/org/apache/catalina/session
                        JDBCStore.java LocalStrings.properties
  Log:
  Fix bug 31886. Prevent tomcat from hanging if a
      ConcurrentModificationException occurs. Handled same
      way as an SQLException.
    - Patch based on a suggestion by Tom Anderson
  
  Revision  Changes    Path
  1.15      +5 -1      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/JDBCStore.java
  
  Index: JDBCStore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/JDBCStore.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JDBCStore.java	26 Aug 2004 21:39:08 -0000	1.14
  +++ JDBCStore.java	15 Nov 2004 22:14:57 -0000	1.15
  @@ -30,6 +30,8 @@
   import java.sql.ResultSet;
   import java.sql.SQLException;
   import java.util.ArrayList;
  +import java.util.ConcurrentModificationException;
  +
   import org.apache.catalina.Container;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.Loader;
  @@ -710,6 +712,8 @@
                   log(sm.getString(getStoreName()+".SQLException", e));
               } catch (IOException e) {
                   ;
  +            } catch (ConcurrentModificationException e) {
  +                log(sm.getString(getStoreName()+".ConcurrentModificationException", e));
               } finally {
                   if(bis != null) {
                       bis.close();
  
  
  
  1.14      +1 -0      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LocalStrings.properties	12 Feb 2004 20:52:52 -0000	1.13
  +++ LocalStrings.properties	15 Nov 2004 22:14:57 -0000	1.14
  @@ -11,6 +11,7 @@
   JDBCStore.loading=Loading Session {0} from database {1}
   JDBCStore.removing=Removing Session {0} at database {1}
   JDBCStore.SQLException=SQL Error {0}
  +JDBCStore.ConcurrentModificationException=Error saving session {0}
   JDBCStore.checkConnectionDBClosed=The database connection is null or was found to be closed.
Trying to re-open it.
   JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The database
could be down.
   JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message