[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jboss-cvs-commits
Subject:    [jboss-cvs] jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc JDBCLoadEntityCommand.java JDBCStoreManage
From:       Alexey Loubyansky <loubyansky () users ! sourceforge ! net>
Date:       2004-02-28 0:52:30
Message-ID: E1AwsiU-00069H-Bi () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

  User: loubyansky
  Date: 04/02/27 16:52:30

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc Tag: Branch_3_2
                        JDBCLoadEntityCommand.java JDBCStoreManager.java
  Log:
  ejbLoad wasn't called when an instance was populated with on-find preloaded data after activation.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.23 +5 -2      jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadEntityCommand.java
  
  Index: JDBCLoadEntityCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadEntityCommand.java,v
  retrieving revision 1.19.2.22
  retrieving revision 1.19.2.23
  diff -u -r1.19.2.22 -r1.19.2.23
  --- JDBCLoadEntityCommand.java	12 Dec 2003 18:49:59 -0000	1.19.2.22
  +++ JDBCLoadEntityCommand.java	28 Feb 2004 00:52:29 -0000	1.19.2.23
  @@ -36,7 +36,7 @@
    * @author <a href="mailto:dirk@jboss.de">Dirk Zimmermann</a>
    * @author <a href="mailto:danch@nvisia.com">danch (Dan Christopherson)</a>
    * @author <a href="mailto:alex@jboss.org">Alexey Loubyansky</a>
  - * @version $Revision: 1.19.2.22 $
  + * @version $Revision: 1.19.2.23 $
    */
   public final class JDBCLoadEntityCommand
   {
  @@ -107,7 +107,10 @@
         ReadAheadCache readAheadCache = manager.getReadAheadCache();
   
         // load any preloaded fields into the context
  -      readAheadCache.load(ctx);
  +      if(readAheadCache.load(ctx))
  +      {
  +         return true;
  +      }
   
         // get the finder results associated with this context, if it exists
         ReadAheadCache.EntityReadAheadInfo info = readAheadCache.getEntityReadAheadInfo(id);
  
  
  
  1.42.2.26 +1 -12     jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStoreManager.java
  
  Index: JDBCStoreManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStoreManager.java,v
  retrieving revision 1.42.2.25
  retrieving revision 1.42.2.26
  diff -u -r1.42.2.25 -r1.42.2.26
  --- JDBCStoreManager.java	12 Feb 2004 16:36:43 -0000	1.42.2.25
  +++ JDBCStoreManager.java	28 Feb 2004 00:52:29 -0000	1.42.2.26
  @@ -57,7 +57,7 @@
    * @author <a href="mailto:dain@daingroup.com">Dain Sundstrom</a>
    * @author <a href="mailto:alex@jboss.org">Alex Loubyansky</a>
    * @see org.jboss.ejb.EntityPersistenceStore
  - * @version $Revision: 1.42.2.25 $
  + * @version $Revision: 1.42.2.26 $
    */
   public final class JDBCStoreManager implements EntityPersistenceStore
   {
  @@ -581,17 +581,6 @@
      public void activateEntity(EntityEnterpriseContext ctx)
      {
         activateEntityCommand.execute(ctx);
  -
  -      // looad at the cache for preloaded data
  -      boolean loaded = readAheadCache.load(ctx);
  -
  -      // if there was some preloaded (in this current tx) data, we can set valid to true
  -      // and avoid executing load command when the instance is accessed.
  -      if(loaded)
  -      {
  -         ctx.setValid(true);
  -         entityBridge.setCreated(ctx);
  -      }
      }
   
      /**
  
  
  


-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]