From 972bb8f2321d78eabeb1cccbdf1f3a4a3c182845 Mon Sep 17 00:00:00 2001 From: hns Date: Thu, 3 May 2007 14:52:14 +0000 Subject: [PATCH] * Fix indentation in Transactor.kill() --- src/helma/objectmodel/db/Transactor.java | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/helma/objectmodel/db/Transactor.java b/src/helma/objectmodel/db/Transactor.java index 4ef954a6..549e8e9c 100644 --- a/src/helma/objectmodel/db/Transactor.java +++ b/src/helma/objectmodel/db/Transactor.java @@ -413,32 +413,32 @@ public class Transactor extends Thread { * Kill this transaction thread. Used as last measure only. */ public synchronized void kill() { - killed = true; - interrupt(); + killed = true; + interrupt(); // Interrupt the thread if it has not noticed the flag (e.g. because it is busy // reading from a network socket). if (isAlive()) { - interrupt(); - try { - join(1000); - } catch (InterruptedException ir) { - // interrupted by other thread - } + interrupt(); + try { + join(1000); + } catch (InterruptedException ir) { + // interrupted by other thread + } } if (isAlive() && "true".equals(nmgr.app.getProperty("requestTimeoutStop"))) { - // still running - check if we ought to stop() it - try { - Thread.sleep(2000); - if (isAlive()) { - // thread is still running, pull emergency break - nmgr.app.logEvent("Stopping Thread for Transactor " + this); - stop(); - } - } catch (InterruptedException ir) { - // interrupted by other thread + // still running - check if we ought to stop() it + try { + Thread.sleep(2000); + if (isAlive()) { + // thread is still running, pull emergency break + nmgr.app.logEvent("Stopping Thread for Transactor " + this); + stop(); } + } catch (InterruptedException ir) { + // interrupted by other thread + } } }