[jBoss-Dev] CVS update: jboss/src/main/org/jboss/ejb/pluginsEntitySynchronizationInterceptor.java

[jBoss CVS Development]

  User: oberg   
  Date: 00/06/21 04:51:32

  Modified:    src/main/org/jboss/ejb/plugins
                        EntitySynchronizationInterceptor.java
  Log:
  Added some stateful container files
  
  Revision  Changes    Path
  1.6       +9 -6      
jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java
  
  Index: EntitySynchronizationInterceptor.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EntitySynchronizationInterceptor.java     2000/06/16 13:10:23     1.5
  +++ EntitySynchronizationInterceptor.java     2000/06/21 11:51:31     1.6
  @@ -47,7 +47,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.6 $
    */
   public class EntitySynchronizationInterceptor
      extends AbstractInterceptor
  @@ -149,10 +149,13 @@
         {
            // Anonymous was sent in, so if it has an id it was created
                        EnterpriseContext ctx = mi.getEnterpriseContext();
  -         if (ctx.getId() != null && mi.getTransaction().getStatus() == 
Status.STATUS_ACTIVE)
  +         if (ctx.getId() != null)
            {
  -            // Set tx
  -            register(ctx, mi.getTransaction());
  +                             if (mi.getTransaction().getStatus() == 
Status.STATUS_ACTIVE)
  +                             {
  +                                     // Set tx
  +                                     register(ctx, mi.getTransaction());
  +                             }
               
               // Currently synched with underlying storage
               ((EntityEnterpriseContext)ctx).setSynchronized(true);
  @@ -174,9 +177,9 @@
         if (current.getStatus() == Status.STATUS_ACTIVE)
         {
            // Synchronize with DB
  -//DEBUG         Logger.debug("SYNCH");
            if (!ctx.isSynchronized())
            {
  +//DEBUG               Logger.debug("SYNCH");
               
((EntityContainer)getContainer()).getPersistenceManager().loadEntity(ctx);
               ctx.setSynchronized(true);
            }
  @@ -209,9 +212,9 @@
            // No tx
            
            // Synchronize with DB
  -//DEBUG         Logger.debug("SYNCH");
            if (!ctx.isSynchronized())
            {
  +//DEBUG            Logger.debug("SYNCH");
               
((EntityContainer)getContainer()).getPersistenceManager().loadEntity(ctx);
               ctx.setSynchronized(true);
            }