From bc412fe4490dbf42dd1208dadbe74ecf5ea0bcbe Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Mon, 26 Apr 2010 20:15:33 +0000 Subject: [PATCH] --- .../org/wamblee/usermgt/hibernate/HibernateGroupSet.java | 8 ++++---- .../org/wamblee/usermgt/hibernate/HibernateUserSet.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) 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 237ba3ae..1b359e20 100644 --- 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 910ea431..f8e02bd5 100644 --- 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; -- 2.31.1