From 1ee8cc4e8daf001172f2a3aa1a8c2a89706e988f Mon Sep 17 00:00:00 2001 From: oowekyala Date: Thu, 27 Jul 2017 01:18:31 +0200 Subject: [PATCH] Fix bug in key hashcode with null names or metric --- .../pmd/lang/java/metrics/api/JavaClassMetricKey.java | 2 +- .../pmd/lang/java/metrics/api/JavaOperationMetricKey.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java index 501c1a05a3..38e2c9ef8f 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java @@ -111,7 +111,7 @@ public enum JavaClassMetricKey implements MetricKey { @Override public int hashCode() { - return metric.hashCode() * 31 + name.hashCode(); + return (metric != null ? metric.hashCode() * 31 : 0) + (name != null ? name.hashCode() : 0); } }; } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java index f4c1680696..3ab49b3c3f 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java @@ -115,7 +115,7 @@ public enum JavaOperationMetricKey implements MetricKey