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

[Norman Richards]

  User: nrichards
  Date: 07/09/21 15:02:06

  Modified:    src/main/org/jboss/seam/framework   EntityHome.java
                        HibernateEntityHome.java
  Log:
  JBSEAM-1704
  
  Revision  Changes    Path
  1.22      +20 -16    jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- EntityHome.java	8 Aug 2007 11:37:33 -0000	1.21
  +++ EntityHome.java	21 Sep 2007 19:02:06 -0000	1.22
  @@ -69,18 +69,22 @@
      @Override
      public E find()
      {
  -      if ( getEntityManager().isOpen() )
  -      {
  -         E result = getEntityManager().find( getEntityClass(), getId() );
  -         if (result==null) result = handleNotFound();
  -         return result;
  +        if (getEntityManager().isOpen())  {
  +            E result = loadInstance();
  +            if (result==null) {
  +                result = handleNotFound();
         }
  -      else
  -      {
  +            return result;
  +        } else {
            return null;
         }
      }
      
  +    protected E loadInstance() 
  +    {
  +        return getEntityManager().find(getEntityClass(), getId());
  +    }
  +
      @Override
      protected void joinTransaction()
      {
  
  
  
  1.18      +21 -17    jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityHome.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HibernateEntityHome.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityHome.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- HibernateEntityHome.java	16 Aug 2007 22:21:02 -0000	1.17
  +++ HibernateEntityHome.java	21 Sep 2007 19:02:06 -0000	1.18
  @@ -68,18 +68,22 @@
      @Override
      public E find()
      {
  -      if ( getSession().isOpen() )
  -      {
  -         E result = (E) getSession().get( getEntityClass(), (Serializable) getId() );
  -         if (result==null) result = handleNotFound();
  -         return result;
  +        if (getSession().isOpen()) {
  +            E result = loadInstance();
  +            if (result==null) {
  +                result = handleNotFound();
         }
  -      else
  -      {
  +            return result;
  +        } else {
            return null;
         }
      }
      
  +    protected E loadInstance() 
  +    {
  +        return (E) getSession().get(getEntityClass(), (Serializable) getId());   
  +    }
  +
      @Override
      protected void joinTransaction()
      {