a better session handling

diff --git a/source/mir/core/service/storage/SessionHolder.java b/source/mir/core/service/storage/SessionHolder.java
new file mode 100755 (executable)
index 0000000..cab2696
--- /dev/null
+++ b/source/mir/core/service/storage/SessionHolder.java
@@ -0,0 +1,73 @@
+/*
+ * SessionHolder.java created on 18.08.2003
+ * 
+ * Copyright (C) 2001, 2002, 2003 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
+package mir.core.service.storage;
+
+import net.sf.hibernate.HibernateException;
+import net.sf.hibernate.Session;
+import net.sf.hibernate.SessionFactory;
+
+/**
+ * SessionHolder
+ * @author idefix
+ * @version $Id: SessionHolder.java,v 1.1 2003/08/19 00:42:38 idfx Exp $
+ */
+public class SessionHolder {
+       private ThreadLocal threadLocalSession;
+       private SessionFactory factory;
+
+       /**
+        * 
+        */
+       public SessionHolder(SessionFactory factory) {
+               super();
+               threadLocalSession = new ThreadLocal();
+               this.factory = factory;
+       }
+       
+       public Session currentSession() 
+               throws HibernateException{
+               Session session = (Session)threadLocalSession.get();
+               if(session == null){
+                       session = factory.openSession();
+                       threadLocalSession.set(session);
+               } 
+               return session;
+       }
+       
+       public void closeSession() throws HibernateException {
+               Session session = (Session) threadLocalSession.get();
+               threadLocalSession.set(null);
+               if (session != null) {
+                       session.close();
+               }
+       } 
+}

diff --git a/source/mir/core/service/storage/StorageService.java b/source/mir/core/service/storage/StorageService.java
index efa2e50..fb81d7f 100755 (executable)
--- a/source/mir/core/service/storage/StorageService.java
+++ b/source/mir/core/service/storage/StorageService.java
@@ -45,24 +45,24 @@ import net.sf.hibernate.expression.Expression;
  * 
  * StorageService
  * @author idefix
- * @version $Id: StorageService.java,v 1.1 2003/08/17 19:11:49 idfx Exp $
+ * @version $Id: StorageService.java,v 1.2 2003/08/19 00:42:38 idfx Exp $
  */
 public abstract class StorageService {
        private Class objectClass;
-       private SessionFactory factory;
-       
+       private SessionHolder sessionHolder;
+
        public StorageService(Class objectClass, SessionFactory factory){
                this.objectClass = objectClass;
-               this.factory = factory;
+               sessionHolder = new SessionHolder(factory);
        }
-
+       
        public List list(int offset, int limit){
                return list(offset, limit, null);
        }
        
        public List list(int offset, int limit, Expression expression){
                try {
-                       Session session = factory.openSession();
+                       Session session = sessionHolder.currentSession();
                        Transaction transaction = session.beginTransaction();
                        Criteria criteria = session.createCriteria(objectClass);
                        if(expression != null){
@@ -73,20 +73,18 @@ public abstract class StorageService {
                                .setMaxResults(limit);
                        List returnList = criteria.list();
                        transaction.commit();
-                       session.close();
                        return returnList;
                } catch (HibernateException e) {
                        throw new StorageServiceFailure(e);
-               }
+               } 
        }
        
        public Object load(Integer id){
                try {
-                       Session session = factory.openSession();
+                       Session session = sessionHolder.currentSession();
                        Transaction transaction = session.beginTransaction();
                        Object returnObject = session.load(objectClass, id);
                        transaction.commit();
-                       session.close();
                        return returnObject;
                } catch (HibernateException e) {
                        throw new StorageServiceFailure(e);
@@ -95,10 +93,10 @@ public abstract class StorageService {
        
        public Integer add(Object newObject){
                try {
-                       Session session = factory.openSession();
+                       Session session = sessionHolder.currentSession();
                        Transaction transaction = session.beginTransaction();
                        Integer newid = (Integer)session.save(newObject);
-                       session.close();
+                       transaction.commit();
                        return newid;
                } catch (HibernateException e) {
                        throw new StorageServiceFailure(e);
@@ -107,10 +105,10 @@ public abstract class StorageService {
        
        public void update(Object toUpdate){
                try {
-                       Session session = factory.openSession();
+                       Session session = sessionHolder.currentSession();
                        Transaction transaction = session.beginTransaction();
                        session.update(toUpdate);
-                       session.close();
+                       transaction.commit();
                } catch (HibernateException e) {
                        throw new StorageServiceFailure(e);
                }                       
@@ -118,13 +116,17 @@ public abstract class StorageService {
        
        public void delete(Object toDelete){
                try {
-                       Session session = factory.openSession();
+                       Session session = sessionHolder.currentSession();
                        Transaction transaction = session.beginTransaction();
                        session.delete(toDelete);
-                       session.close();
+                       transaction.commit();
                } catch (HibernateException e) {
                        throw new StorageServiceFailure(e);
                }                       
        }
        
+       public void finalize() throws Throwable {
+               sessionHolder.closeSession();
+               super.finalize();       
+       }
 }