| @@ -64,7 +64,7 @@ public class DelegatedResourceComparator extends ResourceComparator { | |||||
| return true; | return true; | ||||
| } | } | ||||
| if (isReference()) { | if (isReference()) { | ||||
| return getCheckedRef(DelegatedResourceComparator.class).equals(o); | |||||
| return getRef().equals(o); | |||||
| } | } | ||||
| if (o instanceof DelegatedResourceComparator) { | if (o instanceof DelegatedResourceComparator) { | ||||
| List<ResourceComparator> ov = ((DelegatedResourceComparator) o).resourceComparators; | List<ResourceComparator> ov = ((DelegatedResourceComparator) o).resourceComparators; | ||||
| @@ -80,7 +80,7 @@ public class DelegatedResourceComparator extends ResourceComparator { | |||||
| @Override | @Override | ||||
| public synchronized int hashCode() { | public synchronized int hashCode() { | ||||
| if (isReference()) { | if (isReference()) { | ||||
| return getCheckedRef(DelegatedResourceComparator.class).hashCode(); | |||||
| return getRef().hashCode(); | |||||
| } | } | ||||
| return resourceComparators == null ? 0 : resourceComparators.hashCode(); | return resourceComparators == null ? 0 : resourceComparators.hashCode(); | ||||
| } | } | ||||
| @@ -118,6 +118,10 @@ s. | |||||
| } | } | ||||
| } | } | ||||
| private DelegatedResourceComparator getRef() { | |||||
| return getCheckedRef(DelegatedResourceComparator.class); | |||||
| } | |||||
| private static Comparator<Resource> composite(List<? extends Comparator<Resource>> foo) { | private static Comparator<Resource> composite(List<? extends Comparator<Resource>> foo) { | ||||
| Comparator<Resource> result = null; | Comparator<Resource> result = null; | ||||
| if (foo != null) { | if (foo != null) { | ||||