Now working with both hibernate and eclipselink

[utils] / security / impl / src / main / java / org / wamblee / usermgt / User.java

diff --git a/security/impl/src/main/java/org/wamblee/usermgt/User.java b/security/impl/src/main/java/org/wamblee/usermgt/User.java
index 00280bcc49bbbdba709e69d9de2d253950a6abfd..0e1c545394a7d0031c067c8f8fcf92d9a7a7f9eb 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/usermgt/User.java
+++ b/security/impl/src/main/java/org/wamblee/usermgt/User.java
@@ -15,13 +15,7 @@
  */
 package org.wamblee.usermgt;
 
-import org.wamblee.security.AbstractPersistent;
-import org.wamblee.security.encryption.MessageDigester;
-
-import org.wamblee.usermgt.UserMgtException.Reason;
-
 import java.io.Serializable;
-
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -38,6 +32,9 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
 
+import org.wamblee.security.encryption.MessageDigester;
+import org.wamblee.usermgt.UserMgtException.Reason;
+
 /**
  * Represents a user. The methods for managing the groups of the user have
  * package scope. Managing the groups of the user should be done through the
@@ -50,7 +47,7 @@ import javax.persistence.Version;
         User.NAME_PARAM),
     @NamedQuery(name = User.QUERY_FIND_BY_GROUP_NAME, query = "select user from User user join user.groups grp where grp.name = :name"),
     @NamedQuery(name = User.QUERY_COUNT_USERS, query = "select count(u) from User u"),
-    @NamedQuery(name = User.QUERY_ALL_USERS, query = "select u from User u")})
+    @NamedQuery(name = User.QUERY_ALL_USERS, query = "select u from User u") })
 public class User implements Serializable, Comparable {
 
     public static final String QUERY_FIND_BY_NAME = "User.findByName";
@@ -122,7 +119,7 @@ public class User implements Serializable, Comparable {
      * 
      */
     public User(User aUser) {
-        primaryKey  = aUser.primaryKey;
+        primaryKey = aUser.primaryKey;
         version = aUser.version;
         name = aUser.name;
         password = aUser.password;
@@ -359,6 +356,9 @@ public class User implements Serializable, Comparable {
      */
     @Override
     public boolean equals(Object aUser) {
+        if (aUser == null) {
+            return false;
+        }
         if (!(aUser instanceof User)) {
             return false;
         }