#2686 Fixed SandboxWrapFactory for executing scripts by Rhino - rever…

…t ScriptExecutor; override toString for SandboxNativeJavaObject
SCADA-LTS · Sep 5, 2023 · f72f2f6 · f72f2f6
1 parent b8dd280
commit f72f2f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java b/src/com/serotonin/mango/rt/dataSource/meta/ScriptExecutor.java
@@ -167,10 +167,7 @@ public PointValueTime execute(String script,
 					if (o == null)
 						result = null;
 					else {
-						if (o instanceof NativeJavaObject) {
-							NativeJavaObject nativeJavaObject = (NativeJavaObject)o;
-							result = nativeJavaObject.getDefaultValue(String.class);
-						} else if (!(o instanceof AbstractPointWrapper)) {
+						if (!(o instanceof AbstractPointWrapper)) {
 							result = o.toString();
 						} else {
 							result = o;

diff --git a/src/org/scada_lts/scripting/SandboxNativeJavaObject.java b/src/org/scada_lts/scripting/SandboxNativeJavaObject.java
@@ -71,4 +71,8 @@ public Object get(String methodName, Scriptable start) {
 		return NOT_FOUND;
 	}
 
+	@Override
+	public String toString() {
+		return String.valueOf(super.getDefaultValue(String.class));
+	}
 }