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

[Gavin King]

  User: gavin   
  Date: 06/09/25 20:29:52

  Modified:    src/main/org/jboss/seam/core  
                        ManagedPersistenceContext.java
                        ManagedHibernateSession.java
  Log:
  fix bugs in PC handling
  
  Revision  Changes    Path
  1.19      +8 -8      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.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- ManagedPersistenceContext.java	23 Sep 2006 16:30:12 -0000	1.18
  +++ ManagedPersistenceContext.java	26 Sep 2006 00:29:52 -0000	1.19
  @@ -1,16 +1,16 @@
  -//$Id: ManagedPersistenceContext.java,v 1.18 2006/09/23 16:30:12 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.19 2006/09/26 00:29:52 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import java.io.Serializable;
   
  -import javax.ejb.PostActivate;
  -import javax.ejb.PrePassivate;
   import javax.naming.NamingException;
   import javax.persistence.EntityManager;
   import javax.persistence.EntityManagerFactory;
   import javax.persistence.FlushModeType;
  +import javax.servlet.http.HttpSessionActivationListener;
  +import javax.servlet.http.HttpSessionEvent;
   import javax.transaction.SystemException;
   
   import org.apache.commons.logging.Log;
  @@ -37,7 +37,7 @@
   @Scope(ScopeType.CONVERSATION)
   @Intercept(NEVER)
   @Mutable
  -public class ManagedPersistenceContext implements Serializable
  +public class ManagedPersistenceContext implements Serializable, HttpSessionActivationListener
   {
   
      private static final Log log = LogFactory.getLog(ManagedPersistenceContext.class);
  @@ -99,8 +99,8 @@
         return entityManager;
      }
      
  -   @PrePassivate
  -   public void passivate()
  +   //we can't use @PrePassivate because it is intercept NEVER
  +   public void sessionWillPassivate(HttpSessionEvent event)
      {
         if ( !Persistence.isDirty(entityManager) )
         {
  @@ -109,8 +109,8 @@
         }
      }
      
  -   @PostActivate
  -   public void activate()
  +   //we can't use @PostActivate because it is intercept NEVER
  +   public void sessionDidActivate(HttpSessionEvent event)
      {
         if (entityManager==null)
         {
  
  
  
  1.19      +8 -8      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.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- ManagedHibernateSession.java	23 Sep 2006 15:41:39 -0000	1.18
  +++ ManagedHibernateSession.java	26 Sep 2006 00:29:52 -0000	1.19
  @@ -1,13 +1,13 @@
  -//$Id: ManagedHibernateSession.java,v 1.18 2006/09/23 15:41:39 gavin Exp $
  +//$Id: ManagedHibernateSession.java,v 1.19 2006/09/26 00:29:52 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
   
   import java.io.Serializable;
   
  -import javax.ejb.PostActivate;
  -import javax.ejb.PrePassivate;
   import javax.naming.NamingException;
  +import javax.servlet.http.HttpSessionActivationListener;
  +import javax.servlet.http.HttpSessionEvent;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  @@ -34,7 +34,7 @@
   @Scope(ScopeType.CONVERSATION)
   @Intercept(NEVER)
   @Mutable
  -public class ManagedHibernateSession implements Serializable
  +public class ManagedHibernateSession implements Serializable, HttpSessionActivationListener
   {
      
      /** The serialVersionUID */
  @@ -90,8 +90,8 @@
         return session;
      }
      
  -   @PrePassivate
  -   public void passivate()
  +   //we can't use @PrePassivate because it is intercept NEVER
  +   public void sessionWillPassivate(HttpSessionEvent event)
      {
         if ( !session.isDirty() )
         {
  @@ -100,8 +100,8 @@
         }
      }
      
  -   @PostActivate
  -   public void activate()
  +   //we can't use @PostActivate because it is intercept NEVER
  +   public void sessionDidActivate(HttpSessionEvent event)
      {
         if (session==null)
         {