From 48a8f535513d7a3b0d8948470c4317e946798992 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 1 Jul 2015 19:05:35 +0300 Subject: [PATCH] Fix ClassCastException in SamAdapterOverridabilityCondition This was happening on the upcoming hierarchy of property getters and setters in kotlin.reflect. No test added because it's not so easy to come up with a small example, and because the fix itself is rather trivial --- .../kotlin/load/java/sam/SamAdapterOverridabilityCondition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java index 4ee46b2ce47..6606487ef60 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java @@ -30,7 +30,7 @@ import java.util.List; public class SamAdapterOverridabilityCondition implements ExternalOverridabilityCondition { @Override public boolean isOverridable(@NotNull CallableDescriptor superDescriptor, @NotNull CallableDescriptor subDescriptor) { - if (subDescriptor instanceof PropertyDescriptor) { + if (!(subDescriptor instanceof SimpleFunctionDescriptor)) { return true; }