Skip importing same class twice (fixes mozilla#1463)

FOCONIS · Oct 4, 2024 · a7de078 · a7de078
1 parent d2e2921
commit a7de078
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rhino/src/main/java/org/mozilla/javascript/ImporterTopLevel.java b/rhino/src/main/java/org/mozilla/javascript/ImporterTopLevel.java
@@ -219,7 +219,10 @@ private static void importClass(Scriptable scope, NativeJavaClass cl) {
         String s = cl.getClassObject().getName();
         String n = s.substring(s.lastIndexOf('.') + 1);
         Object val = scope.get(n, scope);
-        if (val != NOT_FOUND && val != cl) {
+        if (val != NOT_FOUND) {
+            if (val.equals(cl)) {
+                return; // do not redefine same class
+            }
             throw Context.reportRuntimeErrorById("msg.prop.defined", n);
         }
         // defineProperty(n, cl, DONTENUM);