X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fusermgt%2FGroup.java;h=87ab4ac7c9cd980e8b311adbcde9fe78412a471c;hb=5bbd2c6e9dcf47e312122a3205c78b676a724e07;hp=697f1b5b343a75a84b6b0905d3f526df7bddc262;hpb=1649e57210e0ce7319ec1816a3e5de24883807db;p=utils diff --git a/security/impl/src/main/java/org/wamblee/usermgt/Group.java b/security/impl/src/main/java/org/wamblee/usermgt/Group.java index 697f1b5b..87ab4ac7 100644 --- a/security/impl/src/main/java/org/wamblee/usermgt/Group.java +++ b/security/impl/src/main/java/org/wamblee/usermgt/Group.java @@ -25,11 +25,8 @@ import javax.persistence.Id; import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; -import javax.persistence.UniqueConstraint; import javax.persistence.Version; -import org.wamblee.security.AbstractPersistent; - /** * Represents a group. * @@ -116,6 +113,9 @@ public class Group implements Serializable, Comparable { */ @Override public boolean equals(Object aGroup) { + if (aGroup == null) { + return false; + } if (!(aGroup instanceof Group)) { return false; } @@ -141,10 +141,14 @@ public class Group implements Serializable, Comparable { public int compareTo(Object aGroup) { return name.compareTo(((Group) aGroup).name); } - + public Long getPrimaryKey() { return primaryKey; } + + public void setPrimaryKey(Long aKey) { + primaryKey = aKey; + } /* * (non-Javadoc)