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

Make sure we enter and exit a Context in serialize()/deserialize().

Browse source 
Do not wrap return object in deserialize().
This commit is contained in:
hns 2005-03-18 13:50:41 +00:00
parent 0dd4dba0f7
commit 892fe4b6e1
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,16 +461,21 @@ public class RhinoEngine implements ScriptingEngine {
* @throws java.io.IOException
*/
public void serialize(Object obj, OutputStream out) throws IOException {
// use a special ScriptableOutputStream that unwraps Wrappers
ScriptableOutputStream sout = new ScriptableOutputStream(out, core.global) {
protected Object replaceObject(Object obj) throws IOException {
if (obj instanceof Wrapper)
obj = ((Wrapper) obj).unwrap();
return super.replaceObject(obj);
}
};
sout.writeObject(obj);
sout.flush();
Context.enter();
try {
// use a special ScriptableOutputStream that unwraps Wrappers
ScriptableOutputStream sout = new ScriptableOutputStream(out, core.global) {
protected Object replaceObject(Object obj) throws IOException {
if (obj instanceof Wrapper)
obj = ((Wrapper) obj).unwrap();
return super.replaceObject(obj);
}
};
sout.writeObject(obj);
sout.flush();
} finally {
Context.exit();
}
}
/**
@ -483,9 +488,13 @@ public class RhinoEngine implements ScriptingEngine {
* @throws java.io.IOException
*/
public Object deserialize(InputStream in) throws IOException, ClassNotFoundException {
ObjectInputStream sin = new ScriptableInputStream(in, core.global);
Object deserialized = sin.readObject();
return Context.toObject(deserialized, core.global);
Context.enter();
try {
ObjectInputStream sin = new ScriptableInputStream(in, core.global);
return sin.readObject();
} finally {
Context.exit();
}
}
/**