From 11d95ce2f1274876afd17f39e74d7897335d6c81 Mon Sep 17 00:00:00 2001 From: hns Date: Fri, 4 Jun 2004 16:06:33 +0000 Subject: [PATCH] Move call to typemgr.checkPrototypes() from RequestEvaluator to RhinoCore. The TypeManager and Prototype classes will move to the helma.scripting package in the near future. --- src/helma/framework/core/RequestEvaluator.java | 4 +--- src/helma/scripting/rhino/RhinoCore.java | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/helma/framework/core/RequestEvaluator.java b/src/helma/framework/core/RequestEvaluator.java index efbc8600..5524f5d5 100644 --- a/src/helma/framework/core/RequestEvaluator.java +++ b/src/helma/framework/core/RequestEvaluator.java @@ -109,9 +109,7 @@ public final class RequestEvaluator implements Runnable { try { do { - // long startCheck = System.currentTimeMillis (); - app.typemgr.checkPrototypes(); - // initialize scripting engine + // initialize scripting engine, in case it hasn't been initialized yet initScriptingEngine(); // update scripting prototypes scriptingEngine.updatePrototypes(); diff --git a/src/helma/scripting/rhino/RhinoCore.java b/src/helma/scripting/rhino/RhinoCore.java index 8f2ef863..4ee33b3e 100644 --- a/src/helma/scripting/rhino/RhinoCore.java +++ b/src/helma/scripting/rhino/RhinoCore.java @@ -322,6 +322,10 @@ public final class RhinoCore { return; } + // init prototypes and/or update prototype checksums + app.typemgr.checkPrototypes(); + + // get a collection of all prototypes (code directories) Collection protos = app.getPrototypes(); // in order to respect inter-prototype dependencies, we try to update