From 170f8c1375c8826c6397de0eb80e2fa29d2bfe5f Mon Sep 17 00:00:00 2001 From: kamaci Date: Mon, 9 Jan 2017 17:40:04 +0200 Subject: [PATCH] NUTCH-2346 Types are checked at object equality --- src/java/org/apache/nutch/crawl/GeneratorJob.java | 8 ++++++++ src/java/org/apache/nutch/metadata/Metadata.java | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/java/org/apache/nutch/crawl/GeneratorJob.java b/src/java/org/apache/nutch/crawl/GeneratorJob.java index 162759066c..3bfa2494aa 100644 --- a/src/java/org/apache/nutch/crawl/GeneratorJob.java +++ b/src/java/org/apache/nutch/crawl/GeneratorJob.java @@ -119,6 +119,14 @@ public int hashCode() { @Override public boolean equals(Object obj) { + if (obj == null) { + return false; + } + + if (this.getClass() != obj.getClass()) { + return false; + } + SelectorEntry other = (SelectorEntry) obj; if (!url.equals(other.url)) return false; diff --git a/src/java/org/apache/nutch/metadata/Metadata.java b/src/java/org/apache/nutch/metadata/Metadata.java index 03c5db85c8..a56ec2be69 100644 --- a/src/java/org/apache/nutch/metadata/Metadata.java +++ b/src/java/org/apache/nutch/metadata/Metadata.java @@ -190,13 +190,12 @@ public boolean equals(Object o) { return false; } - Metadata other = null; - try { - other = (Metadata) o; - } catch (ClassCastException cce) { + if (this.getClass() != o.getClass()) { return false; } + Metadata other = (Metadata) o; + if (other.size() != size()) { return false; }