From 67ad10971025c851a79a28ed3b428804bc41fa6d Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Wed, 6 Dec 2017 11:06:47 +0000 Subject: [PATCH] Correct two equality checks on incomparable types --- .../org/elasticsearch/index/mapper/GeoShapeFieldMapper.java | 2 +- .../src/main/java/org/elasticsearch/painless/Definition.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java index db40fb228bc57..68d6ac66678e7 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java @@ -369,7 +369,7 @@ public String strategyName() { public void setStrategyName(String strategyName) { checkIfFrozen(); this.strategyName = strategyName; - if (this.strategyName.equals(SpatialStrategy.TERM)) { + if (this.strategyName.equals(SpatialStrategy.TERM.getStrategyName())) { this.pointsOnly = true; } } diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java index e5bfb82c73148..df56c599f0372 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/Definition.java @@ -768,7 +768,7 @@ private void addConstructor(String ownerStructName, Whitelist.Constructor whitel painlessConstructor = new Method("", ownerStruct, null, getTypeInternal("void"), painlessParametersTypes, asmConstructor, javaConstructor.getModifiers(), javaHandle); ownerStruct.constructors.put(painlessMethodKey, painlessConstructor); - } else if (painlessConstructor.equals(painlessParametersTypes) == false){ + } else if (painlessConstructor.arguments.equals(painlessParametersTypes) == false){ throw new IllegalArgumentException( "illegal duplicate constructors [" + painlessMethodKey + "] found within the struct [" + ownerStruct.name + "] " + "with parameters " + painlessParametersTypes + " and " + painlessConstructor.arguments);