From 77c524de33e575349ab905f7c5060daa668f7e14 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 14 Nov 2016 11:54:10 +0300 Subject: [PATCH] Minor. Remove redundant if 'inType' var is guaranteed to be not-null --- .../org/jetbrains/kotlin/resolve/DescriptorResolver.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index a141ba180fc..33c279194e6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -926,13 +926,8 @@ public class DescriptorResolver { else { type = typeResolver.resolveType(scopeWithTypeParameters, typeReference, trace, true); KotlinType inType = propertyDescriptor.getType(); - if (inType != null) { - if (!TypeUtils.equalTypes(type, inType)) { - trace.report(WRONG_SETTER_PARAMETER_TYPE.on(typeReference, inType, type)); - } - } - else { - // TODO : the same check may be needed later??? + if (!TypeUtils.equalTypes(type, inType)) { + trace.report(WRONG_SETTER_PARAMETER_TYPE.on(typeReference, inType, type)); } }