[jboss-cvs] JBossAS SVN: r109122 - in projects/ejb3/branches/jboss-ejb3-core-1.3: src/main/java/org/jboss/ejb3 and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2010-11-04 09:03:31 -0400 (Thu, 04 Nov 2010)
New Revision: 109122

Modified:
   projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml
   projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/TimerServiceContainer.java
Log:
JBPAPP-3308: using TimerServiceFactory_2 to propagate the correct class loader


Modified: projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml
===================================================================
--- projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml	2010-11-04 13:02:13 UTC (rev 109121)
+++ projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml	2010-11-04 13:03:31 UTC (rev 109122)
@@ -397,7 +397,7 @@
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-timerservice-spi</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.4</version>
     </dependency>
 
     <dependency>

Modified: projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/TimerServiceContainer.java
===================================================================
--- projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/TimerServiceContainer.java	2010-11-04 13:02:13 UTC (rev 109121)
+++ projects/ejb3/branches/jboss-ejb3-core-1.3/src/main/java/org/jboss/ejb3/TimerServiceContainer.java	2010-11-04 13:03:31 UTC (rev 109122)
@@ -21,19 +21,19 @@
  */
 package org.jboss.ejb3;
 
-import java.util.Hashtable;
-
-import javax.ejb.Timeout;
-import javax.ejb.TimerService;
-
 import org.jboss.aop.Domain;
 import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.ejb3.timerservice.spi.TimedObjectInvoker;
 import org.jboss.ejb3.timerservice.spi.TimerServiceFactory;
+import org.jboss.ejb3.timerservice.spi.TimerServiceFactory_2;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
 
+import javax.ejb.Timeout;
+import javax.ejb.TimerService;
+import java.util.Hashtable;
+
 /**
  * A {@link EJBContainer} which contains the common functionality around EJB3 timer service.
  * 
@@ -141,7 +141,7 @@
       // restore timerservice for non-stateful beans
       if (this.isStatefulBean() == false)
       {
-         this.timerServiceFactory.restoreTimerService(timerService);
+         restoreTimerService();
       }
    }
 
@@ -249,4 +249,14 @@
       return this.timerServiceFactory.createTimerService(timedObjectInvoker);
    }
 
+   private void restoreTimerService()
+   {
+      if(timerServiceFactory instanceof TimerServiceFactory_2)
+         ((TimerServiceFactory_2) timerServiceFactory).restoreTimerService(timerService, classloader);
+      else
+      {
+         logger.warn("EJBHREE-2193: using deprecated TimerServiceFactory for restoring timers");
+         timerServiceFactory.restoreTimerService(timerService);
+      }
+   }
 }