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

[Gavin King]

  User: gavin   
  Date: 07/01/25 13:53:55

  Modified:    src/main/org/jboss/seam/framework    EntityHome.java
                        HibernateEntityHome.java Home.java
  Log:
  reload entity after setting id
  
  Revision  Changes    Path
  1.12      +1 -1      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.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- EntityHome.java	9 Jan 2007 05:14:39 -0000	1.11
  +++ EntityHome.java	25 Jan 2007 18:53:55 -0000	1.12
  @@ -42,7 +42,7 @@
         getEntityManager().joinTransaction();
         getEntityManager().persist( getInstance() );
         getEntityManager().flush();
  -      setId( PersistenceProvider.instance().getId( getInstance(), getEntityManager() ) );
  +      assignId( PersistenceProvider.instance().getId( getInstance(), getEntityManager() ) );
         createdMessage();
         return "persisted";
      }
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- HibernateEntityHome.java	9 Jan 2007 05:14:39 -0000	1.8
  +++ HibernateEntityHome.java	25 Jan 2007 18:53:55 -0000	1.9
  @@ -36,7 +36,7 @@
      {
         getSession().persist( getInstance() );
         getSession().flush();
  -      setId( getSession().getIdentifier( getInstance() ) );
  +      assignId( getSession().getIdentifier( getInstance() ) );
         createdMessage();
         return "persisted";
      }
  
  
  
  1.11      +6 -0      jboss-seam/src/main/org/jboss/seam/framework/Home.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Home.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Home.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- Home.java	21 Dec 2006 02:38:26 -0000	1.10
  +++ Home.java	25 Jan 2007 18:53:55 -0000	1.11
  @@ -149,6 +149,12 @@
   
      public void setId(Object id)
      {
  +      if ( setDirty(this.id, id) ) setInstance(null);
  +      this.id = id;
  +   }
  +   
  +   protected void assignId(Object id)
  +   {
         setDirty(this.id, id);
         this.id = id;
      }