This is an automated email from the ASF dual-hosted git repository. gjacoby pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new 581bfab PHOENIX-5380 : Avoid possibility of ClassCastException with equals() of Column and Scenario 581bfab is described below commit 581bfab85389d94e72781c1c9d63defa20f7fd44 Author: Viraj Jasani <vjas...@salesforce.com> AuthorDate: Fri Jun 28 22:16:09 2019 +0530 PHOENIX-5380 : Avoid possibility of ClassCastException with equals() of Column and Scenario --- .../src/main/java/org/apache/phoenix/pherf/configuration/Column.java | 3 +++ .../src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java index 0d64a39..c121451 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Column.java @@ -62,6 +62,9 @@ public class Column { */ @Override public boolean equals(Object column) { + if (!(column instanceof Column)) { + return false; + } Column col = (Column)column; return (getType() == col.getType()); } diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java index 513445e..cd208bb 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/Scenario.java @@ -56,6 +56,9 @@ public class Scenario { */ @Override public boolean equals(Object object) { + if (!(object instanceof Scenario)) { + return false; + } Scenario scenario = (Scenario) object; return (this.tableName.equals(scenario.getTableName())); }