topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

fix: wrappers cache compare objects with .equals and not ==

Browse Source
This commit is contained in:
TopchetoEU 2024-04-21 11:03:00 +03:00
parent 8a8de518a6
commit 49b52d90a7
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java/me/topchetoeu/jscript/runtime/values/NativeWrapper.java
View File

@ -7,7 +7,28 @@ import me.topchetoeu.jscript.runtime.Key;
import me.topchetoeu.jscript.utils.interop.NativeWrapperProvider;
public class NativeWrapper extends ObjectValue {
private static final Key<WeakHashMap<Object, NativeWrapper>> WRAPPERS = new Key<>();
private static class MapKey {
public final Object key;
@Override
public int hashCode() {
return System.identityHashCode(key);
}
@Override
public boolean equals(Object obj) {
if (this == null || obj == null) return this == null && obj == null;
if (!(obj instanceof MapKey)) return false;
var other = (MapKey)obj;
return other.key == key;
}
public MapKey(Object key) {
this.key = key;
}
}
private static final Key<WeakHashMap<MapKey, NativeWrapper>> WRAPPERS = new Key<>();
private static final Object NATIVE_PROTO = new Object();
public final Object wrapped;
@ -48,10 +69,12 @@ public class NativeWrapper extends ObjectValue {
exts.add(WRAPPERS, wrappers);
}
if (wrappers.containsKey(wrapped)) return wrappers.get(wrapped);
var key = new MapKey(wrapped);
if (wrappers.containsKey(key)) return wrappers.get(key);
var res = new NativeWrapper(wrapped);
wrappers.put(wrapped, res);
wrappers.put(key, res);
return res;
}