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

* Set thread field in updatePrototypes() already so

Browse source 
it is already set when the RequestEvaluator calls
  Application.getDataRoot(), which may result in a function
  invocation (chicken and egg problem, sort of)
This commit is contained in:
hns 2006-04-28 13:58:01 +00:00
parent 7b622f8c54
commit 1b26370377
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/scripting/rhino/RhinoEngine.java
View file

@ -145,6 +145,12 @@ public class RhinoEngine implements ScriptingEngine {
* engine know it should update its prototype information.
*/
public void updatePrototypes() throws IOException {
// remember the current thread as our thread - we this here so
// the thread is already set when the RequestEvaluator calls
// Application.getDataRoot(), which may result in a function invocation
// (chicken and egg problem, kind of)
thread = Thread.currentThread();
context = Context.enter();
context.setCompileFunctionsWithDynamicScope(true);
context.setApplicationClassLoader(app.getClassLoader());
@ -331,8 +337,9 @@ public class RhinoEngine implements ScriptingEngine {
throw concur;
} catch (Exception x) {
// has the request timed out? If so, throw TimeoutException
if (thread != Thread.currentThread())
throw new TimeoutException ();
if (thread != Thread.currentThread()) {
throw new TimeoutException();
}
// create and throw a ScriptingException with the right message
String msg;