-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update dependency org.mozilla:rhino to v1.7.15 #75
base: helma-🐜
Are you sure you want to change the base?
Conversation
52418a6
to
025c96c
Compare
Copied from #39 (comment): Currently throwing exception trying to access cleanly installed welcome app: [ERROR] [welcome-1] GET:favicon.ico org.mozilla.javascript.EvaluatorException: Wrapped java.lang.NullPointerException (/Users/tobi/Desktop/helma/modules/tools/Global/helma.Inspector.js#304)
org.mozilla.javascript.EvaluatorException: Wrapped java.lang.NullPointerException (/Users/tobi/Desktop/helma/modules/tools/Global/helma.Inspector.js#304)
at helma.scripting.rhino.RhinoCore.getValidPrototype(RhinoCore.java:448)
at helma.scripting.rhino.RhinoCore.getNodeWrapper(RhinoCore.java:695)
at helma.scripting.rhino.RhinoCore$WrapMaker.wrap(RhinoCore.java:1136)
at org.mozilla.javascript.ScriptRuntime.toObject(ScriptRuntime.java:1258)
at org.mozilla.javascript.ScriptRuntime.toObject(ScriptRuntime.java:1176)
at org.mozilla.javascript.Context.toObject(Context.java:1640)
at helma.scripting.rhino.RhinoEngine.setGlobals(RhinoEngine.java:203)
at helma.framework.core.RequestEvaluator.initGlobals(RequestEvaluator.java:1008)
at helma.framework.core.RequestEvaluator.run(RequestEvaluator.java:222)
at java.base/java.lang.Thread.run(Thread.java:829) |
025c96c
to
2d24670
Compare
2b5d34a
to
b41c1b2
Compare
b41c1b2
to
fe7bad0
Compare
The Rhino commit causing the exception is mozilla/rhino@73a8b29 – found via A work-around is patching MemberBox.java with an NP check: diff --git a/src/org/mozilla/javascript/MemberBox.java b/src/org/mozilla/javascript/MemberBox.java
index a24d4743..e97a2811 100644
--- a/src/org/mozilla/javascript/MemberBox.java
+++ b/src/org/mozilla/javascript/MemberBox.java
@@ -202,10 +202,13 @@ final class MemberBox implements Serializable {
if (target instanceof Delegator) {
target = ((Delegator) target).getDelegee();
}
- for (int i = 0; i < args.length; ++i) {
- if (args[i] instanceof Delegator) {
- args[i] = ((Delegator) args[i]).getDelegee();
- }
+
+ if (args != null) {
+ for (int i = 0; i < args.length; ++i) {
+ if (args[i] instanceof Delegator) {
+ args[i] = ((Delegator) args[i]).getDelegee();
+ }
+ }
}
try { |
Digging deeper, there is a weird inconsistency between // Context.java
public static final Object[] emptyArgs = ScriptRuntime.emptyArgs;
// ScriptRuntime.java
public static final Object[] emptyArgs = new Object[0];
// JavaMembers.java
rval = bp.getter.invoke(javaObject, Context.emptyArgs);
// Context.emptyArgs != ScriptRuntime.emptyArgs 🤷 At this point, diff --git a/src/org/mozilla/javascript/JavaMembers.java b/src/org/mozilla/javascript/JavaMembers.java
index f9c457b0..58fc8f3b 100644
--- a/src/org/mozilla/javascript/JavaMembers.java
+++ b/src/org/mozilla/javascript/JavaMembers.java
@@ -100,7 +100,7 @@ class JavaMembers {
if (member instanceof BeanProperty) {
BeanProperty bp = (BeanProperty) member;
if (bp.getter == null) return Scriptable.NOT_FOUND;
- rval = bp.getter.invoke(javaObject, Context.emptyArgs);
+ rval = bp.getter.invoke(javaObject, ScriptRuntime.emptyArgs);
type = bp.getter.method().getReturnType();
} else {
Field field = (Field) member; It begs the question if this is a Rhino issue, or if there is some Helma code causing this… |
bd2c103
to
b8abe5a
Compare
d231fd8
to
adecb51
Compare
61c4440
to
daf8da6
Compare
bb72f3f
to
ebf9b22
Compare
da985c7
to
03c5b63
Compare
03c5b63
to
5e6ee68
Compare
5e6ee68
to
a34dd7f
Compare
a34dd7f
to
4635578
Compare
4635578
to
a3d074b
Compare
a3d074b
to
dc16b50
Compare
dc16b50
to
526235b
Compare
526235b
to
77dde4a
Compare
77dde4a
to
57013f8
Compare
57013f8
to
d1c9373
Compare
892ac82
to
85f6102
Compare
d1c9373
to
434c535
Compare
24be038
to
f2feef4
Compare
d1ddce0
to
5de4616
Compare
434c535
to
3b5a454
Compare
This PR contains the following updates:
1.7.13
->1.7.15
Warning
Some dependencies could not be looked up. Check the Dependency Dashboard for more information.
Release Notes
mozilla/rhino (org.mozilla:rhino)
v1.7.15
May 3, 2024
Highlights of this release include:
This release includes committs from 29 different committers. Thanks to you all for your help!
v1.7.14
January 6, 2022
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Mend Renovate. View the repository job log.