This commit is contained in:
kunfei
2023-03-21 12:43:54 +08:00
parent 9ffec4212a
commit 3b8e500db0
2 changed files with 4 additions and 4 deletions
@@ -123,7 +123,7 @@ class AnalyzeUrl(
} }
} }
} }
result = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), result) as String result = evalJS(jsMatcher.group(2) ?: jsMatcher.group(1), result).toString()
start = jsMatcher.end() start = jsMatcher.end()
} }
if (ruleUrl.length > start) { if (ruleUrl.length > start) {
@@ -342,7 +342,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
scope: Scriptable, scope: Scriptable,
thisObj: Scriptable, thisObj: Scriptable,
args: Array<Any> args: Array<Any>
): Any { ): Any? {
var accCtxt: AccessControlContext? = null var accCtxt: AccessControlContext? = null
val global = ScriptableObject.getTopLevelScope(scope) val global = ScriptableObject.getTopLevelScope(scope)
val globalProto = global.prototype val globalProto = global.prototype
@@ -358,7 +358,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
thisObj, thisObj,
args args
) )
} as PrivilegedAction<Any>, accCtxt) else superDoTopCall( } as PrivilegedAction<*>, accCtxt) else superDoTopCall(
callable, callable,
cx, cx,
scope, scope,
@@ -373,7 +373,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
scope: Scriptable, scope: Scriptable,
thisObj: Scriptable, thisObj: Scriptable,
args: Array<Any> args: Array<Any>
): Any { ): Any? {
return super.doTopCall(callable, cx, scope, thisObj, args) return super.doTopCall(callable, cx, scope, thisObj, args)
} }
}) })