From 612faa8f44e2e31450ccf7bc5105f506453cd485 Mon Sep 17 00:00:00 2001 From: twogee Date: Mon, 27 Jul 2020 14:02:24 +0200 Subject: [PATCH] Refactor getCheckedRef() --- .../comparators/DelegatedResourceComparator.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java index 55a13f14b..34069a954 100644 --- a/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java +++ b/src/main/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.java @@ -64,7 +64,7 @@ public class DelegatedResourceComparator extends ResourceComparator { return true; } if (isReference()) { - return getCheckedRef(DelegatedResourceComparator.class).equals(o); + return getRef().equals(o); } if (o instanceof DelegatedResourceComparator) { List ov = ((DelegatedResourceComparator) o).resourceComparators; @@ -80,7 +80,7 @@ public class DelegatedResourceComparator extends ResourceComparator { @Override public synchronized int hashCode() { if (isReference()) { - return getCheckedRef(DelegatedResourceComparator.class).hashCode(); + return getRef().hashCode(); } return resourceComparators == null ? 0 : resourceComparators.hashCode(); } @@ -118,6 +118,10 @@ s. } } + private DelegatedResourceComparator getRef() { + return getCheckedRef(DelegatedResourceComparator.class); + } + private static Comparator composite(List> foo) { Comparator result = null; if (foo != null) {