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 7462507a149bf9531926dcfb16f9ecba29b6a3d0..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
@@ -47,7 +47,7 @@ import org.wamblee.usermgt.UserMgtException.Reason;
         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";
@@ -119,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;
@@ -356,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;
         }