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

[dblevins]

dblevins    2005/08/30 00:46:33

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

  Workaround for a classloader issue in CMP Container
  
  Revision  Changes    Path
  1.11      +6 -2      
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CastorCMP11_EntityContainer.java  28 Aug 2005 08:29:46 -0000      1.10
  +++ CastorCMP11_EntityContainer.java  30 Aug 2005 04:46:33 -0000      1.11
  @@ -432,9 +432,13 @@
               try{
                   File base = SystemInstance.get().getBase().getDirectory();
                   systemProperties.setProperty("user.dir", 
base.getAbsolutePath());
  +                ClassLoader classLoader = 
deployments()[0].getBeanClass().getClassLoader();
  +                jdo_ForLocalTransaction.setClassLoader(classLoader);
                   jdo_ForLocalTransaction.getDatabase();
  +                jdo_ForGlobalTransaction.setClassLoader(classLoader);
                   jdo_ForGlobalTransaction.getDatabase();
               } catch (Throwable e){
  +                logger.fatal("Castor JDO initialization failed: 
"+e.getMessage(), e);
                   throw (IllegalStateException) new 
IllegalStateException("Castor JDO initialization failed").initCause(e);
               } finally {
                   systemProperties.setProperty("user.dir",userDir);