You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/01/09 19:30:39 UTC
cvs commit: jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic HibernateModelManagerImpl.java
epugh 2004/01/09 10:30:39
Modified: security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic
HibernateModelManagerImpl.java
security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic
HibernateModelManagerImpl.java
Log:
Don't inadvertantly close a session!
Revision Changes Path
1.2 +1 -4 jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic/HibernateModelManagerImpl.java
Index: HibernateModelManagerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/dynamic/HibernateModelManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateModelManagerImpl.java 5 Dec 2003 23:20:25 -0000 1.1
+++ HibernateModelManagerImpl.java 9 Jan 2004 18:30:39 -0000 1.2
@@ -259,7 +259,6 @@
session.update(user);
session.update(group);
transaction.commit();
- session.close();
return;
}
}
@@ -305,7 +304,6 @@
session.update(user);
session.update(group);
transaction.commit();
- session.close();
return;
}
}
@@ -383,7 +381,6 @@
session.update(role);
session.update(group);
transaction.commit();
- session.close();
return;
}
}
1.2 +4 -6 jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic/HibernateModelManagerImpl.java
Index: HibernateModelManagerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/security/hibernate/src/java/org/apache/fulcrum/security/hibernate/basic/HibernateModelManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HibernateModelManagerImpl.java 5 Dec 2003 23:20:25 -0000 1.1
+++ HibernateModelManagerImpl.java 9 Jan 2004 18:30:39 -0000 1.2
@@ -63,7 +63,6 @@
import org.apache.fulcrum.security.model.basic.BasicModelManager;
import org.apache.fulcrum.security.model.basic.entity.BasicGroup;
import org.apache.fulcrum.security.model.basic.entity.BasicUser;
-
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
/**
@@ -97,14 +96,14 @@
userExists = getUserManager().checkExists(user);
if (groupExists && userExists)
{
- ((BasicUser) user).addGroup(group);
- ((BasicGroup) group).addUser(user);
+
Session session = getPersistenceHelper().retrieveSession();
Transaction transaction = session.beginTransaction();
+ ((BasicUser) user).addGroup(group);
+ ((BasicGroup) group).addUser(user);
session.update(user);
session.update(group);
transaction.commit();
- session.close();
return;
}
}
@@ -150,7 +149,6 @@
session.update(user);
session.update(group);
transaction.commit();
- session.close();
return;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org