[openejb-scm] openejb/modules/core/src/java/org/openejb GenericEJBContainer.java

[djencks]

djencks     2005/02/01 17:26:02

  Modified:    modules/core/src/java/org/openejb GenericEJBContainer.java
  Log:

  GERONIMO-562. Use app classloader for TCCL in ejbTimeout
  
  Revision  Changes    Path
  1.34      +8 -9      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- GenericEJBContainer.java  1 Feb 2005 00:58:03 -0000       1.33
  +++ GenericEJBContainer.java  1 Feb 2005 22:26:00 -0000       1.34
  @@ -51,8 +51,8 @@
   import java.rmi.RemoteException;
   import java.security.Permissions;
   import java.util.Iterator;
  -import java.util.Set;
   import java.util.Map;
  +import java.util.Set;
   import javax.ejb.EJBHome;
   import javax.ejb.EJBLocalHome;
   import javax.ejb.EJBLocalObject;
  @@ -60,14 +60,15 @@
   import javax.ejb.Handle;
   import javax.ejb.Timer;
   import javax.management.ObjectName;
  +import javax.naming.Context;
   import javax.security.auth.Subject;
   import javax.security.jacc.PolicyConfiguration;
   import javax.security.jacc.PolicyConfigurationFactory;
   import javax.security.jacc.PolicyContextException;
  -import javax.naming.Context;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.geronimo.common.GeronimoSecurityException;
   import org.apache.geronimo.core.service.Interceptor;
   import org.apache.geronimo.core.service.Invocation;
   import org.apache.geronimo.core.service.InvocationResult;
  @@ -76,17 +77,15 @@
   import org.apache.geronimo.gbean.GBeanLifecycle;
   import org.apache.geronimo.gbean.WaitingException;
   import org.apache.geronimo.kernel.Kernel;
  +import org.apache.geronimo.naming.java.SimpleReadOnlyContext;
  +import org.apache.geronimo.naming.reference.ClassLoaderAwareReference;
  +import org.apache.geronimo.naming.reference.KernelAwareReference;
   import org.apache.geronimo.security.ContextManager;
  -import org.apache.geronimo.common.GeronimoSecurityException;
   import org.apache.geronimo.security.jacc.RoleMappingConfiguration;
   import org.apache.geronimo.timer.ThreadPooledTimer;
  -import org.apache.geronimo.timer.WorkInfo;
   import org.apache.geronimo.transaction.TrackedConnectionAssociator;
   import org.apache.geronimo.transaction.UserTransactionImpl;
   import org.apache.geronimo.transaction.context.TransactionContextManager;
  -import org.apache.geronimo.naming.java.SimpleReadOnlyContext;
  -import org.apache.geronimo.naming.reference.KernelAwareReference;
  -import org.apache.geronimo.naming.reference.ClassLoaderAwareReference;
   import org.openejb.cache.InstancePool;
   import org.openejb.client.EJBObjectHandler;
   import org.openejb.client.EJBObjectProxy;
  @@ -200,7 +199,7 @@
           contextFactory.setSystemChain(chains.getSystemChain());
           
contextFactory.setTransactionContextManager(transactionContextManager);
           if (timer != null) {
  -            timerService = new BasicTimerService(systemMethodIndices, 
interceptor, timer, objectName, kernel.getKernelName(), 
ObjectName.getInstance(objectName), transactionContextManager);
  +            timerService = new BasicTimerService(systemMethodIndices, 
interceptor, timer, objectName, kernel.getKernelName(), 
ObjectName.getInstance(objectName), transactionContextManager, classLoader);
               contextFactory.setTimerService(timerService);
           } else {
               timerService = null;