428708 JDBCSessionIdManager when clearing expired sessions failed, jetty should still be able to startup

1 files changed, 8 insertions, 3 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
index 90e96889e9..bdc735f1e4 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
@@ -900,7 +900,6 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
      * @throws Exception
      */
     private void cleanExpiredSessions ()
-    throws Exception
     {
         Connection connection = null;
         PreparedStatement statement = null;
@@ -946,8 +945,14 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager
         catch (Exception e)
         {
             if (connection != null)
-                connection.rollback();
-            throw e;
+            {
+                try 
+                { 
+                    LOG.warn("Rolling back clean of expired sessions", e);
+                    connection.rollback();
+                }
+                catch (Exception x) { LOG.warn("Rollback of expired sessions failed", x);}
+            }
         }
         finally
         {