[jboss-cvs] jboss-seam/src/main/org/jboss/seam/persistence ...

[Gavin King]

  User: gavin   
  Date: 07/07/16 05:24:01

  Modified:    src/main/org/jboss/seam/persistence  
                        EntityManagerFactory.java
                        HibernateSessionFactory.java
  Log:
  don't need lazy
  
  Revision  Changes    Path
  1.5       +3 -25     jboss-seam/src/main/org/jboss/seam/persistence/EntityManagerFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityManagerFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/EntityManagerFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- EntityManagerFactory.java	16 Jul 2007 08:45:27 -0000	1.4
  +++ EntityManagerFactory.java	16 Jul 2007 09:24:01 -0000	1.5
  @@ -1,4 +1,4 @@
  -//$Id: EntityManagerFactory.java,v 1.4 2007/07/16 08:45:27 gavin Exp $
  +//$Id: EntityManagerFactory.java,v 1.5 2007/07/16 09:24:01 gavin Exp $
   package org.jboss.seam.persistence;
   
   import java.util.HashMap;
  @@ -29,20 +29,14 @@
   @Startup
   public class EntityManagerFactory
   {
  +   private javax.persistence.EntityManagerFactory entityManagerFactory;
   
      private String persistenceUnitName;
      private Map persistenceUnitProperties;
  -   private javax.persistence.EntityManagerFactory entityManagerFactory;
  -   
  -   private boolean lazy;
      
      @Unwrap
      public javax.persistence.EntityManagerFactory getEntityManagerFactory()
      {
  -      if (lazy && entityManagerFactory==null)
  -      {
  -         entityManagerFactory = createEntityManagerFactory();
  -      }
         return entityManagerFactory;
      }
      
  @@ -53,11 +47,8 @@
         {
            persistenceUnitName = component.getName();
         }
  -      if (!lazy)
  -      {
            entityManagerFactory = createEntityManagerFactory();
         }
  -   }
   
      @Destroy
      public void shutdown()
  @@ -121,17 +112,4 @@
         this.persistenceUnitProperties = persistenceUnitProperties;
      }
   
  -   /**
  -    * Should the EMF be created lazily when first needed?
  -    */
  -   public boolean isLazy()
  -   {
  -      return lazy;
  -   }
  -
  -   public void setLazy(boolean lazy)
  -   {
  -      this.lazy = lazy;
  -   }
  -
   }
  
  
  
  1.5       +2 -21     jboss-seam/src/main/org/jboss/seam/persistence/HibernateSessionFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateSessionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/persistence/HibernateSessionFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- HibernateSessionFactory.java	16 Jul 2007 08:45:27 -0000	1.4
  +++ HibernateSessionFactory.java	16 Jul 2007 09:24:01 -0000	1.5
  @@ -1,4 +1,4 @@
  -//$Id: HibernateSessionFactory.java,v 1.4 2007/07/16 08:45:27 gavin Exp $
  +//$Id: HibernateSessionFactory.java,v 1.5 2007/07/16 09:24:01 gavin Exp $
   package org.jboss.seam.persistence;
   
   import java.io.File;
  @@ -67,26 +67,17 @@
      private List<String> mappingResources;
      private NamingStrategy namingStrategy;
      
  -   private boolean lazy;
  -   
      @Unwrap
      public SessionFactory getSessionFactory() throws Exception
      {
  -      if (lazy && sessionFactory==null)
  -      {
  -         sessionFactory = createSessionFactory();
  -      }
         return sessionFactory;
      }
      
      @Create
      public void startup() throws Exception
      {
  -      if (!lazy)
  -      {
            sessionFactory = createSessionFactory();
         }
  -   }
      
      @Destroy
      public void shutdown()
  @@ -254,14 +245,4 @@
         this.mappingResources = mappingResources;
      }
   
  -   public boolean isLazy()
  -   {
  -      return lazy;
  -   }
  -
  -   public void setLazy(boolean lazy)
  -   {
  -      this.lazy = lazy;
  -   }
  -   
   }