(no commit message)

diff --git a/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java
index 237ba3aed27f6fcc9f20a5b9776f41754f7e833b..1b359e205610a08a7721b5e02e0cd6e0a1e44d5f 100644 (file)
--- a/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java
+++ b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateGroupSet.java
@@ -51,7 +51,7 @@ public class HibernateGroupSet extends HibernateSupport implements GroupSet {
      */
     public void groupModified(Group aGroup) {
         assert aGroup.getPrimaryKey() != null;
-        super.merge(aGroup);
+        //super.merge(aGroup);
     }
 
     /*
@@ -96,7 +96,7 @@ public class HibernateGroupSet extends HibernateSupport implements GroupSet {
             return false;
         }
 
-        super.merge(aGroup);
+        //super.merge(aGroup);
 
         return true;
     }
@@ -115,8 +115,8 @@ public class HibernateGroupSet extends HibernateSupport implements GroupSet {
 
         Group group = (Group) getHibernateTemplate().merge(aGroup);
         getHibernateTemplate().delete(group);
-        aGroup.setPrimaryKey(null);
-        aGroup.setPersistedVersion(-1);
+       // aGroup.setPrimaryKey(null);
+       // aGroup.setPersistedVersion(-1);
 
         return true;
     }

diff --git a/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java
index 910ea431479ffa5b98e4954126a491b2f1b701b5..f8e02bd56eca6f68a6519afefb5bc49cd5f59a85 100644 (file)
--- a/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java
+++ b/security/jpatest/src/main/java/org/wamblee/usermgt/hibernate/HibernateUserSet.java
@@ -98,7 +98,7 @@ public class HibernateUserSet extends AbstractUserSet {
      */
     public void userModified(User aUser) {
         assert aUser.getPrimaryKey() != null;
-        hibernateSupport.merge(aUser);
+        //hibernateSupport.merge(aUser);
         cache.remove(aUser.getName());
         setPasswordInfo(aUser);
         cache.put(aUser.getName(), new User(aUser));
@@ -177,8 +177,8 @@ public class HibernateUserSet extends AbstractUserSet {
 
         User user = (User) getHibernateTemplate().merge(aUser);
         getHibernateTemplate().delete(user);
-        aUser.setPersistedVersion(-1);
-        aUser.setPrimaryKey(null);
+        //aUser.setPersistedVersion(-1);
+        //aUser.setPrimaryKey(null);
         cache.remove(aUser.getName());
 
         return true;