antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

* Do not throw Exception in abort().

Browse source 
* Add comments to empty catch blogs to peacify Intellij.
This commit is contained in:
hns 2006-02-06 13:53:16 +00:00
parent abf807e0ad
commit 2f3f7d665c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/helma/objectmodel/db/Transactor.java
View file

@ -350,10 +350,8 @@ public class Transactor extends Thread {
/** /**
* Abort the current transaction, rolling back all changes made. * 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(); Object[] dirty = dirtyNodes.values().toArray();
// evict dirty nodes from cache // evict dirty nodes from cache
@ -409,6 +407,7 @@ public class Transactor extends Thread {
try { try {
join(500); join(500);
} catch (InterruptedException ir) { } catch (InterruptedException ir) {
// interrupted by other thread
} }
// Interrupt the thread if it has not noticed the flag (e.g. because it is busy // 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 { try {
join(1000); join(1000);
} catch (InterruptedException ir) { } catch (InterruptedException ir) {
// interrupted by other thread
} }
} }
} }
@ -436,6 +436,7 @@ public class Transactor extends Thread {
con.close(); con.close();
nmgr.app.logEvent("Closing DB connection: " + con); nmgr.app.logEvent("Closing DB connection: " + con);
} catch (Exception ignore) { } catch (Exception ignore) {
// exception closing db connection, ignore
} }
} }