[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter ...

[Peter Muir]

  User: pmuir   
  Date: 07/06/30 07:40:42

  Modified:    ui/src/main/java/org/jboss/seam/ui/converter 
                        EntityConverterStore.java
  Log:
  JBSEAM-1581
  
  Revision  Changes    Path
  1.3       +12 -2     jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverterStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityConverterStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverterStore.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EntityConverterStore.java	20 Jun 2007 17:53:18 -0000	1.2
  +++ EntityConverterStore.java	30 Jun 2007 11:40:41 -0000	1.3
  @@ -6,12 +6,13 @@
   import java.util.ArrayList;
   import java.util.List;
   
  +import javax.persistence.EntityManager;
  +
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Transactional;
  -import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.framework.EntityIdentifier;
   import org.jboss.seam.framework.MutableEntityController;
  @@ -24,7 +25,6 @@
   @Name("org.jboss.seam.ui.entityConverterStore")
   @Install(precedence=BUILT_IN)
   @Scope(PAGE)
  - at BypassInterceptors
   public class EntityConverterStore extends MutableEntityController
   {
      
  @@ -74,4 +74,14 @@
         }
         return (EntityConverterStore) Component.getInstance(EntityConverterStore.class);
      }
  +   
  +   @Override
  +   public EntityManager getEntityManager()
  +   {
  +      if (!super.getEntityManager().isOpen())
  +      {
  +         super.setEntityManager(null);
  +      }
  +      return super.getEntityManager();
  +   }
   }