From 05727365a113b331f125c30118ed95d422481005 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hannu=20Niemist=C3=B6?= Date: Mon, 30 Oct 2017 19:35:24 +0200 Subject: [PATCH] (refs #7586) Allow always conversion to Object in SCL-Java interface Change-Id: Ia35b1f4dd2b31fc1e218f0321acdd8ac72f03694 --- .../codegen/types/AbstractRuntimeJavaReferenceValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d1e2ade64..d186584d4 100644 --- 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, 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); -- 2.47.1