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

Fix previous commit: do recursively invoke processXmlRpcResponse() on

Browse source 
contents of Maps.
This commit is contained in:
hns 2004-02-18 12:53:54 +00:00
parent 37d086d5f3
commit 21c33be366
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/helma/scripting/rhino/RhinoCore.java
View file

@ -91,7 +91,7 @@ public final class RhinoCore {
// create global object // create global object
global = new DynamicGlobalObject(this, app); global = new DynamicGlobalObject(this, app);
global.init(); global.init();
// call the initStandardsObject in ImporterTopLevel so that // call the initStandardsObject in ImporterTopLevel so that
// importClass() and importPackage() are set up. // importClass() and importPackage() are set up.
global.initStandardObjects(context, false); global.initStandardObjects(context, false);
@ -318,7 +318,7 @@ public final class RhinoCore {
Collection protos = app.getPrototypes(); Collection protos = app.getPrototypes();
// in order to respect inter-prototype dependencies, we try to update // in order to respect inter-prototype dependencies, we try to update
// the global prototype before all other prototypes, and parent // the global prototype before all other prototypes, and parent
// prototypes before their descendants. // prototypes before their descendants.
HashSet checked = new HashSet(protos.size()*2); HashSet checked = new HashSet(protos.size()*2);
@ -511,7 +511,7 @@ public final class RhinoCore {
if (what instanceof NativeObject) { if (what instanceof NativeObject) {
NativeObject no = (NativeObject) what; NativeObject no = (NativeObject) what;
Object[] ids = no.getIds(); Object[] ids = no.getIds();
Hashtable ht = new Hashtable(ids.length); Hashtable ht = new Hashtable(ids.length*2);
for (int i=0; i<ids.length; i++) { for (int i=0; i<ids.length; i++) {
if (ids[i] instanceof String) { if (ids[i] instanceof String) {
String key = (String) ids[i]; String key = (String) ids[i];
@ -533,7 +533,13 @@ public final class RhinoCore {
what = retval; what = retval;
} else if (what instanceof Map) { } else if (what instanceof Map) {
Map map = (Map) what; Map map = (Map) what;
what = new Hashtable(map); Hashtable ht = new Hashtable(map.size()*2);
for (Iterator it=map.entrySet().iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry) it.next();
ht.put(entry.getKey().toString(),
processXmlRpcResponse(entry.getValue()));
}
what = ht;
} else if (what instanceof Number) { } else if (what instanceof Number) {
Number n = (Number) what; Number n = (Number) what;
if (what instanceof Float || what instanceof Long) { if (what instanceof Float || what instanceof Long) {