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

[djencks]

djencks     2005/01/31 19:58:03

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

  Make timer handles work, add some error detection and handling
  
  Revision  Changes    Path
  1.33      +10 -1     
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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- GenericEJBContainer.java  26 Jan 2005 23:27:58 -0000      1.32
  +++ GenericEJBContainer.java  1 Feb 2005 00:58:03 -0000       1.33
  @@ -58,6 +58,7 @@
   import javax.ejb.EJBLocalObject;
   import javax.ejb.EJBObject;
   import javax.ejb.Handle;
  +import javax.ejb.Timer;
   import javax.management.ObjectName;
   import javax.security.auth.Subject;
   import javax.security.jacc.PolicyConfiguration;
  @@ -79,6 +80,7 @@
   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;
  @@ -340,6 +342,11 @@
           return securityConfiguration;
       }
   
  +    public Timer getTimerById(Long id) {
  +        assert timerService != null;
  +        return timerService.getTimerById(id);
  +    }
  +
       private void setupJndi() {
           /* Add Geronimo JNDI service ///////////////////// */
           String str = 
System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
  @@ -479,6 +486,8 @@
   
           infoFactory.addOperation("invoke", new Class[]{Invocation.class});
           infoFactory.addOperation("invoke", new Class[]{Method.class, 
Object[].class, Object.class});
  +
  +        infoFactory.addOperation("getTimerById", new Class[]{Long.class});
   
           infoFactory.setConstructor(new String[]{
               "ContainerID",