You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/05/18 18:31:43 UTC
directory-fortress-core git commit: FC-105 - [fortress-core] - object
does not override hashcode
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 035d4f75d -> 4cddeac50
FC-105 - [fortress-core] - object does not override hashcode
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/4cddeac5
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/4cddeac5
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/4cddeac5
Branch: refs/heads/master
Commit: 4cddeac502f2c3b0726b15cc666844a4deb4dd3b
Parents: 035d4f7
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon May 18 11:29:39 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon May 18 11:29:39 2015 -0500
----------------------------------------------------------------------
.../apache/directory/fortress/core/rbac/AdminRole.java | 11 +++++++++++
.../org/apache/directory/fortress/core/rbac/OrgUnit.java | 11 +++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cddeac5/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
index 2956b15..c18aba8 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
@@ -501,6 +501,17 @@ public class AdminRole extends Role implements Administrator
return thatRole.getName().equalsIgnoreCase( this.getName() );
}
+ @Override
+ public int hashCode()
+ {
+ int result = osPs != null ? osPs.hashCode() : 0;
+ result = 31 * result + ( osUs != null ? osUs.hashCode() : 0 );
+ result = 31 * result + ( beginRange != null ? beginRange.hashCode() : 0 );
+ result = 31 * result + ( endRange != null ? endRange.hashCode() : 0 );
+ result = 31 * result + ( beginInclusive ? 1 : 0 );
+ result = 31 * result + ( endInclusive ? 1 : 0 );
+ return result;
+ }
/**
* @see Object#toString()
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cddeac5/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
index 4159b33..2d92565 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
@@ -440,6 +440,17 @@ public class OrgUnit extends FortEntity implements Graphable, Serializable
return thatOrg.getName().equalsIgnoreCase( this.getName() );
}
+ @Override
+ public int hashCode()
+ {
+ int result = type != null ? type.hashCode() : 0;
+ result = 31 * result + ( name != null ? name.hashCode() : 0 );
+ result = 31 * result + ( id != null ? id.hashCode() : 0 );
+ result = 31 * result + ( description != null ? description.hashCode() : 0 );
+ result = 31 * result + ( parents != null ? parents.hashCode() : 0 );
+ result = 31 * result + ( children != null ? children.hashCode() : 0 );
+ return result;
+ }
/**
* @see Object#toString()