[jboss-cvs] jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc JDBCStoreManager.java

[Dain S. <dsu...@us...>]

  User: dsundstrom
  Date: 02/06/18 08:19:55

  Modified:    src/main/org/jboss/ejb/plugins/cmp/jdbc
                        JDBCStoreManager.java
  Log:
  Moved command creation from initStoreManager to startStoreManager.  This
  is required because some commands access the relationship which are not
  resolved until startStoreManager.
  
  Revision  Changes    Path
  1.41      +18 -17    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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- JDBCStoreManager.java	10 Jun 2002 23:11:12 -0000	1.40
  +++ JDBCStoreManager.java	18 Jun 2002 15:19:54 -0000	1.41
  @@ -60,7 +60,7 @@
    *
    * @author <a href="mailto:da...@da...">Dain Sundstrom</a>
    * @see org.jboss.ejb.EntityPersistenceStore
  - * @version $Revision: 1.40 $
  + * @version $Revision: 1.41 $
    */
   public class JDBCStoreManager implements EntityPersistenceStore
   {
  @@ -410,16 +410,29 @@
         // Set up Commands
         commandFactory = new JDBCCommandFactory(this);
         
  -      // Create store manager life cycle commands
  +      // Execute the init command
         initCommand = commandFactory.createInitCommand();
  +      initCommand.execute();
  +   }
  +
  +   private void resolveRelationships() throws Exception {
  +      entityBridge.resolveRelationships();
  +   }
  +
  +   /**
  +    * Brings the store manager into a completely running state.
  +    * This method will create the database table and compile the queries.
  +    */
  +   private void startStoreManager() throws Exception {
  +      // Store manager life cycle commands
         startCommand = commandFactory.createStartCommand();
         stopCommand = commandFactory.createStopCommand();
         destroyCommand = commandFactory.createDestroyCommand();
         
  -      /// Create ejb life cycle commands
  +      // Entity commands
  +      initEntityCommand = commandFactory.createInitEntityCommand();
         createBeanClassInstanceCommand =
               commandFactory.createCreateBeanClassInstanceCommand();
  -      initEntityCommand = commandFactory.createInitEntityCommand();
         findEntityCommand = commandFactory.createFindEntityCommand();
         findEntitiesCommand = commandFactory.createFindEntitiesCommand();
         createEntityCommand = commandFactory.createCreateEntityCommand();
  @@ -430,23 +443,11 @@
         activateEntityCommand = commandFactory.createActivateEntityCommand();
         passivateEntityCommand = commandFactory.createPassivateEntityCommand();
         
  +      // Relation commands
         loadRelationCommand = commandFactory.createLoadRelationCommand();
         deleteRelationsCommand = commandFactory.createDeleteRelationsCommand();
         insertRelationsCommand = commandFactory.createInsertRelationsCommand();
   
  -      // Execute the init command
  -      initCommand.execute();
  -   }
  -
  -   private void resolveRelationships() throws Exception {
  -      entityBridge.resolveRelationships();
  -   }
  -
  -   /**
  -    * Brings the store manager into a completely running state.
  -    * This method will create the database table and compile the queries.
  -    */
  -   private void startStoreManager() throws Exception {
         // Create the query manager
         queryManager = new JDBCQueryManager(this);