[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/db HibernateUtil.java,1.4,1.5

[Jesper P. <je...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21938

Modified Files:
	HibernateUtil.java 
Log Message:
Use the same session for all threads; enable OSCache

Index: HibernateUtil.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/db/HibernateUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HibernateUtil.java	4 Aug 2005 09:52:00 -0000	1.4
--- HibernateUtil.java	16 Aug 2005 11:43:41 -0000	1.5
***************
*** 33,37 ****
  
    /** The session */
!   private static final ThreadLocal TL = new ThreadLocal();
  
    /**
--- 33,37 ----
  
    /** The session */
!   private static Session session;
  
    /**
***************
*** 40,43 ****
--- 40,44 ----
    private HibernateUtil() {
      sf = null;
+     session = null;
    }
  
***************
*** 60,63 ****
--- 61,65 ----
      try {
        if (sf != null && !sf.isClosed()) {
+         session.close();
          sf.close();
        }
***************
*** 100,103 ****
--- 102,107 ----
        }
  
+       cfg.setProperty("hibernate.cache.provider_class", "org.hibernate.cache.OSCacheProvider");
+ 
        cfg.addClass(Attribute.class);
        cfg.addClass(Edge.class);
***************
*** 107,110 ****
--- 111,115 ----
  
        sf = cfg.buildSessionFactory();
+       session = sf.openSession();
      } catch (Exception e) {
        log.fatal("Exception", e);
***************
*** 117,126 ****
     */
    public Session currentSession() {
!     Session s = (Session)TL.get();
!     if (s == null) {
!       s = sf.openSession();
!       TL.set(s);
!     }
!     return s;
    }
  
--- 122,126 ----
     */
    public Session currentSession() {
!     return session;
    }
  
***************
*** 129,137 ****
     */
    public void closeSession() {
-     Session s = (Session)TL.get();
-     if (s != null) {
-       s.close();
-     }
-     TL.set(null);
    }
  }
--- 129,132 ----