From 5eb4d321a918096abc78e5068e87660cf47e278b Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Tue, 29 Jan 2019 10:25:12 +0100 Subject: [PATCH] Fixed equals() and hashCode() of RepositoryRole --- .../src/main/java/sonia/scm/security/RepositoryRole.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/security/RepositoryRole.java b/scm-webapp/src/main/java/sonia/scm/security/RepositoryRole.java index 12170e3cf4..6b6b06aa9c 100644 --- a/scm-webapp/src/main/java/sonia/scm/security/RepositoryRole.java +++ b/scm-webapp/src/main/java/sonia/scm/security/RepositoryRole.java @@ -1,5 +1,7 @@ package sonia.scm.security; +import org.apache.commons.collections.CollectionUtils; + import java.util.Collection; import java.util.Collections; import java.util.Objects; @@ -32,11 +34,11 @@ public class RepositoryRole { if (!(o instanceof RepositoryRole)) return false; RepositoryRole that = (RepositoryRole) o; return name.equals(that.name) && - verbs.equals(that.verbs); + CollectionUtils.isEqualCollection(this.verbs, that.verbs); } @Override public int hashCode() { - return Objects.hash(name, verbs); + return Objects.hash(name, verbs.size()); } }