diff --git a/.classpath b/.classpath
index e8aec9ea..a460bed0 100644
--- a/.classpath
+++ b/.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/lib/jodd-3.6.6.jar b/lib/jodd-3.6.6.jar
deleted file mode 100644
index 7240f2df..00000000
Binary files a/lib/jodd-3.6.6.jar and /dev/null differ
diff --git a/lib/jodd-3.9.1.jar b/lib/jodd-3.9.1.jar
new file mode 100644
index 00000000..5582a744
Binary files /dev/null and b/lib/jodd-3.9.1.jar differ
diff --git a/src/openaf/plugins/JMX.java b/src/openaf/plugins/JMX.java
index 4af29d3f..5a9f8d30 100644
--- a/src/openaf/plugins/JMX.java
+++ b/src/openaf/plugins/JMX.java
@@ -40,8 +40,10 @@
import openaf.AFBase;
import openaf.AFCmdBase;
+import openaf.JSEngine;
import openaf.SimpleLog;
import openaf.SimpleLog.logtype;
+import openaf.JSEngine.JSList;
/**
* OpenAF plugin to access remote beans through JMX
@@ -257,7 +259,7 @@ public void set(String attrName, Object value) throws InstanceNotFoundException,
* @throws ReflectionException
* @throws IOException
*/
- public Object exec(String operationName, String[] params, String[] signature) throws InstanceNotFoundException, MBeanException, ReflectionException, IOException {
+ public Object exec(String operationName, Object[] params, String[] signature) throws InstanceNotFoundException, MBeanException, ReflectionException, IOException {
return mbeanCon.invoke(obj, operationName, params, signature);
}
}
@@ -290,19 +292,19 @@ public static Object getLocals() throws IOException {
ClassLoaderUtil.addFileToClassPath(toolsFile, ClassLoader.getSystemClassLoader());
List vms = VirtualMachine.list();
- HashMap pmap = new HashMap();
- ArrayList> list = new ArrayList>();
+ JSEngine.JSList list = AFCmdBase.jse.getNewList(AFCmdBase.jse.getGlobalscope());
for(VirtualMachineDescriptor vm : vms) {
- HashMap p = new HashMap();
+ JSEngine.JSMap p = AFCmdBase.jse.getNewMap(AFCmdBase.jse.getGlobalscope());
p.put("id", vm.id());
p.put("name", vm.displayName());
- list.add(p);
+ list.add(p.getMap());
}
- pmap.put("Locals", list);
+ JSEngine.JSMap pmap = AFCmdBase.jse.getNewMap(AFCmdBase.jse.getGlobalscope());
+ pmap.put("Locals", list.getList());
//return AF.jsonParse(PMStringConvert.toJSON4NativeProcessing(pmap));
- return pmap;
+ return pmap.getMap();
}
/**
*
@@ -344,6 +346,6 @@ public static Object attach2Local(String id) throws IOException, AgentLoadExcept
local.put("Agent", new HashMap(map));
//return AF.jsonParse(PMStringConvert.toJSON4NativeProcessing(local));
- return local;
+ return AFBase.fromJavaMap(local);
}
}