From 2f3f7d665cf58f4b5e809e09b6f57cce6e642646 Mon Sep 17 00:00:00 2001 From: hns Date: Mon, 6 Feb 2006 13:53:16 +0000 Subject: [PATCH] * Do not throw Exception in abort(). * Add comments to empty catch blogs to peacify Intellij. --- src/helma/objectmodel/db/Transactor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/helma/objectmodel/db/Transactor.java b/src/helma/objectmodel/db/Transactor.java index 6e233842..495a87f5 100644 --- a/src/helma/objectmodel/db/Transactor.java +++ b/src/helma/objectmodel/db/Transactor.java @@ -350,10 +350,8 @@ public class Transactor extends Thread { /** * Abort the current transaction, rolling back all changes made. - * - * @throws Exception ... */ - public synchronized void abort() throws Exception { + public synchronized void abort() { Object[] dirty = dirtyNodes.values().toArray(); // evict dirty nodes from cache @@ -409,6 +407,7 @@ public class Transactor extends Thread { try { join(500); } catch (InterruptedException ir) { + // interrupted by other thread } // Interrupt the thread if it has not noticed the flag (e.g. because it is busy @@ -419,6 +418,7 @@ public class Transactor extends Thread { try { join(1000); } catch (InterruptedException ir) { + // interrupted by other thread } } } @@ -436,6 +436,7 @@ public class Transactor extends Thread { con.close(); nmgr.app.logEvent("Closing DB connection: " + con); } catch (Exception ignore) { + // exception closing db connection, ignore } }