Merge "(refs #7586) Allow always conversion to Object in SCL-Java interface"

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/types/AbstractRuntimeJavaReferenceValidator.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/types/AbstractRuntimeJavaReferenceValidator.java
index d1e2ade645cdc57006866baa787083b21fd84fba..d186584d4e395c6bdf6863cb41ac2124d9154381 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/types/AbstractRuntimeJavaReferenceValidator.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/types/AbstractRuntimeJavaReferenceValidator.java
@@ -137,7 +137,7 @@ implements JavaReferenceValidator<Class<?>, Method, Field, Constructor<?>> {
 
     @Override
     public boolean isAssignableFrom(TypeDesc to, TypeDesc from) {
-        if(to == from)
+        if(to.equals(from) || to.equals(TypeDesc.OBJECT))
             return true;
         Class<?> toClass = findClass(to);
         Class<?> fromClass = findClass(from);