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

* Synchronize get() and set() to hopefully get rid of weird property read errors.

Browse source 
* Do not access static fields through instance variable
This commit is contained in:
hns 2005-08-18 22:41:00 +00:00
parent 04d8589d29
commit 3d6da7803d
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/helma/scripting/rhino/GlobalObject.java
View file

@ -85,12 +85,25 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
}
/**
* Override ScriptableObject.put() to implement PropertyRecorder interface.
* Override ScriptableObject.get() to synchronize it.
*
* @param name
* @param start
* @return the property for the given name
*/
public synchronized Object get(String name, Scriptable start) {
return super.get(name, start);
}
/**
* Override ScriptableObject.put() to implement PropertyRecorder interface
* and to synchronize method.
*
* @param name
* @param start
* @param value
*/
public void put(String name, Scriptable start, Object value) {
public synchronized void put(String name, Scriptable start, Object value) {
// register property for PropertyRecorder interface
if (isRecording) {
changedProperties.add(name);
@ -519,7 +532,7 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
"the serialization to");
}
Object obj = args[0];
String filename = cx.toString(args[1]);
String filename = Context.toString(args[1]);
FileOutputStream fos = new FileOutputStream(filename);
Scriptable scope = ScriptableObject.getTopLevelScope(thisObj).getPrototype();
// use a ScriptableOutputStream that unwraps Wrappers
@ -542,13 +555,13 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
throw Context.reportRuntimeError(
"Expected a filename to read the serialization from");
}
String filename = cx.toString(args[0]);
String filename = Context.toString(args[0]);
FileInputStream fis = new FileInputStream(filename);
Scriptable scope = ScriptableObject.getTopLevelScope(thisObj).getPrototype();
ObjectInputStream in = new ScriptableInputStream(fis, scope);
Object deserialized = in.readObject();
in.close();
return cx.toObject(deserialized, scope);
return Context.toObject(deserialized, scope);
}