[jBoss-Dev] CVS update:contrib/castorjdo/src/main/org/jboss/jdo/castor CastorJDOImpl.java

[jBoss CVS Development]

  User: oleg    
  Date: 00/10/09 01:43:06

  Modified:    castorjdo/src/main/org/jboss/jdo/castor CastorJDOImpl.java
  Log:
  mapping.xml is now loaded once per jar file (before it was loaded once per bean)
  
  Revision  Changes    Path
  1.3       +10 -2     
contrib/castorjdo/src/main/org/jboss/jdo/castor/CastorJDOImpl.java
  
  Index: CastorJDOImpl.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/contrib/castorjdo/src/main/org/jboss/jdo/castor/CastorJDOImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CastorJDOImpl.java        2000/10/02 13:58:58     1.2
  +++ CastorJDOImpl.java        2000/10/09 08:43:05     1.3
  @@ -45,11 +45,13 @@
   import org.jboss.proxy.Proxies;
   import org.jboss.proxy.InvocationHandler;
   
  +import org.jboss.ejb.BeanClassLoader;
  +
   /**
    *   Castor JDO support
    *
    *   @author Oleg Nitz ([EMAIL PROTECTED])
  - *   @version $Revision: 1.2 $
  + *   @version $Revision: 1.3 $
    */
   public class CastorJDOImpl extends ServiceMBeanSupport 
           implements DataObjects, ObjectFactory, Referenceable, Serializable,
  @@ -126,7 +128,13 @@
       // DataObjects implementation ----------------------------------
       public Database getDatabase()
               throws DatabaseNotFoundException, PersistenceException {
  -        _jdo.setClassLoader(Thread.currentThread().getContextClassLoader());
  +        ClassLoader cl;
  +
  +        cl = Thread.currentThread().getContextClassLoader();
  +        if (cl instanceof BeanClassLoader) {
  +            cl = cl.getParent();
  +        }
  +        _jdo.setClassLoader(cl);
           return _jdo.getDatabase();
       }