[jboss-cvs] JBossAS SVN: r64268 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz.

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

Author: bdecoste
Date: 2007-07-24 19:58:43 -0400 (Tue, 24 Jul 2007)
New Revision: 64268

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
Log:
[EJBTHREE-1019] fix and test for invoking Local proxies remotely. Modified Ejb3Registry to use a GUID instead of the ObjectName of the container.

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java	2007-07-24 23:57:47 UTC (rev 64267)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/TimerServiceImpl.java	2007-07-24 23:58:43 UTC (rev 64268)
@@ -30,6 +30,8 @@
 import javax.ejb.TimerService;
 import javax.management.ObjectName;
 
+import org.jboss.ejb3.Container;
+import org.jboss.ejb3.Ejb3Registry;
 import org.jboss.ejb3.timerservice.TimedObjectInvoker;
 import org.jboss.logging.Logger;
 import org.quartz.JobDetail;
@@ -51,18 +53,20 @@
    private static final Logger log = Logger.getLogger(TimerServiceImpl.class);
    
    private Scheduler scheduler;
+   private Container container;
    private ObjectName objectName;
    private String groupName;
    private long jobNum = 0;
    private long triggerNum = 0;
    
-   protected TimerServiceImpl(Scheduler scheduler, ObjectName objectName, TimedObjectInvoker invoker) {
+   protected TimerServiceImpl(Scheduler scheduler, Container container, TimedObjectInvoker invoker) {
       assert scheduler != null;
-      assert objectName != null;
+      assert container != null;
       assert invoker != null;
       
       this.scheduler = scheduler;
-      this.objectName = objectName;
+      this.container = container;
+      this.objectName = container.getObjectName();
       this.groupName = objectName.getCanonicalName();
    }
    
@@ -76,7 +80,7 @@
          
          Timer timer = new TimerImpl(scheduler, trigger, info);
          
-         PersistentTimer persistentTimer = new PersistentTimer(trigger, objectName, info);
+         PersistentTimer persistentTimer = new PersistentTimer(trigger, Ejb3Registry.guid(container), info);
          
          JobDetail jobDetail = new JobDetail(name, groupName, jobClass);
          jobDetail.getJobDataMap().put("timer", persistentTimer);