From a874998ffb52debb09f15e2241e106e4b413223d Mon Sep 17 00:00:00 2001 From: hns Date: Tue, 30 Jan 2007 14:58:30 +0000 Subject: [PATCH] * Increase default maxThreads value to 50 (evauators aren't that expensive anymore) * Some minor code cleanup --- src/helma/framework/core/Application.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/helma/framework/core/Application.java b/src/helma/framework/core/Application.java index 211dced0..36cd2299 100644 --- a/src/helma/framework/core/Application.java +++ b/src/helma/framework/core/Application.java @@ -550,12 +550,15 @@ public final class Application implements Runnable { try { return (RequestEvaluator) freeThreads.pop(); } catch (EmptyStackException nothreads) { - int maxThreads = 12; + int maxThreads = 50; - try { - maxThreads = Integer.parseInt(props.getProperty("maxThreads")); - } catch (Exception ignore) { - // property not set, use default value + String maxThreadsProp = props.getProperty("maxThreads"); + if (maxThreadsProp != null) { + try { + maxThreads = Integer.parseInt(maxThreadsProp); + } catch (Exception ignore) { + logEvent("Couldn't parse maxThreads property: " + maxThreadsProp); + } } synchronized (this) { @@ -628,10 +631,7 @@ public final class Application implements Runnable { for (int i = 0; i < toBeDestroyed; i++) { try { RequestEvaluator re = (RequestEvaluator) freeThreads.pop(); - allThreads.removeElement(re); - - // typemgr.unregisterRequestEvaluator (re); re.stopTransactor(); } catch (EmptyStackException empty) { return false;