[openejb-scm] openejb1/modules/core/src/java/org/openejb/alt/containers/castor_cmp11 CastorCMP11_EntityContainer.java

[dblevins]

dblevins    2005/07/09 01:53:21

  Modified:    modules/core/src/java/org/openejb/alt/containers/castor_cmp11
                        CastorCMP11_EntityContainer.java
  Log:

  Yanking getBase(props) and getHome(props) calls and replacing with a one-time 
call to:
    FileUtils.init(props)
  Which will reset the home and base instances.
  
  Revision  Changes    Path
  1.6       +6 -6      
openejb1/modules/core/src/java/org/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java
  
  Index: CastorCMP11_EntityContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/containers/castor_cmp11/CastorCMP11_EntityContainer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CastorCMP11_EntityContainer.java  19 Jun 2005 22:40:29 -0000      1.5
  +++ CastorCMP11_EntityContainer.java  9 Jul 2005 05:53:21 -0000       1.6
  @@ -257,10 +257,10 @@
           File gTxDb = null;
           File lTxDb = null;
           try {
  -            gTxDb = FileUtils.getBase(this.props).getFile( 
Global_TX_Database );
  +            gTxDb = FileUtils.getBase().getFile( Global_TX_Database );
           } catch ( Exception ignored ) {
               try {
  -                gTxDb = 
FileUtils.getHome(this.props).getFile(Global_TX_Database);
  +                gTxDb = FileUtils.getHome().getFile(Global_TX_Database);
               } catch (Exception e) {
                   throw new OpenEJBException("Cannot locate the " + 
EnvProps.GLOBAL_TX_DATABASE + " file. "
                           + e.getMessage());
  @@ -268,10 +268,10 @@
           }
   
           try {
  -            lTxDb = FileUtils.getBase(this.props).getFile( Local_TX_Database 
);
  +            lTxDb = FileUtils.getBase().getFile( Local_TX_Database );
           } catch ( Exception ignored ) {
               try {
  -                lTxDb = 
FileUtils.getHome(this.props).getFile(Local_TX_Database);
  +                lTxDb = FileUtils.getHome().getFile(Local_TX_Database);
               } catch (Exception e) {
                   throw new OpenEJBException("Cannot locate the " + 
EnvProps.LOCAL_TX_DATABASE + " file. "
                           + e.getMessage());