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

[Gavin King]

  User: gavin   
  Date: 07/02/02 16:03:53

  Modified:    src/main/org/jboss/seam/core   ManagedHibernateSession.java
                        ManagedPersistenceContext.java
  Log:
  oops
  
  Revision  Changes    Path
  1.30      +10 -4     jboss-seam/src/main/org/jboss/seam/core/ManagedHibernateSession.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedHibernateSession.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedHibernateSession.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- ManagedHibernateSession.java	2 Feb 2007 20:03:38 -0000	1.29
  +++ ManagedHibernateSession.java	2 Feb 2007 21:03:53 -0000	1.30
  @@ -1,4 +1,4 @@
  -//$Id: ManagedHibernateSession.java,v 1.29 2007/02/02 20:03:38 gavin Exp $
  +//$Id: ManagedHibernateSession.java,v 1.30 2007/02/02 21:03:53 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -112,7 +112,7 @@
      //we can't use @PrePassivate because it is intercept NEVER
      public void sessionWillPassivate(HttpSessionEvent event)
      {
  -      if ( !session.isDirty() )
  +      if ( session!=null && !session.isDirty() )
         {
            session.close();
            session = null;
  @@ -129,8 +129,11 @@
         {
            log.debug("destroying seam managed session for session factory: " + sessionFactoryJndiName);
         }
  +      if (session!=null)
  +      {
         session.close();
      }
  +   }
      
      private SessionFactory getSessionFactoryFromJndiOrValueBinding()
      {
  @@ -162,8 +165,11 @@
      
      public void changeFlushMode(FlushModeType flushMode)
      {
  +      if (session!=null)
  +      {
         setSessionFlushMode(flushMode);
      }
  +   }
   
      protected void setSessionFlushMode(FlushModeType flushMode)
      {
  
  
  
  1.36      +10 -4     jboss-seam/src/main/org/jboss/seam/core/ManagedPersistenceContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedPersistenceContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedPersistenceContext.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- ManagedPersistenceContext.java	2 Feb 2007 20:06:26 -0000	1.35
  +++ ManagedPersistenceContext.java	2 Feb 2007 21:03:53 -0000	1.36
  @@ -1,4 +1,4 @@
  -//$Id: ManagedPersistenceContext.java,v 1.35 2007/02/02 20:06:26 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.36 2007/02/02 21:03:53 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -118,7 +118,7 @@
         if (createContext) Lifecycle.beginCall();
         try
         {
  -         if ( !PersistenceProvider.instance().isDirty(entityManager) )
  +         if ( entityManager!=null && !PersistenceProvider.instance().isDirty(entityManager) )
            {
               entityManager.close();
               entityManager = null;
  @@ -140,8 +140,11 @@
         {
            log.debug("destroying seam managed persistence context for persistence unit: " + persistenceUnitJndiName);
         }
  +      if (entityManager!=null)
  +      {
         entityManager.close();
      }
  +   }
      
      public EntityManagerFactory getEntityManagerFactoryFromJndiOrValueBinding()
      {
  @@ -209,8 +212,11 @@
      
      public void changeFlushMode(FlushModeType flushMode)
      {
  +      if (entityManager!=null)
  +      {
         setEntityManagerFlushMode(flushMode);
      }
  +   }
      
      protected void setEntityManagerFlushMode(FlushModeType flushMode)
      {