[jboss-cvs] JBossAS SVN: r64267 - 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:57:47 -0400 (Tue, 24 Jul 2007)
New Revision: 64267

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.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/PersistentTimer.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java	2007-07-24 23:15:52 UTC (rev 64266)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/PersistentTimer.java	2007-07-24 23:57:47 UTC (rev 64267)
@@ -27,7 +27,6 @@
 import javax.ejb.NoSuchObjectLocalException;
 import javax.ejb.Timer;
 import javax.ejb.TimerHandle;
-import javax.management.ObjectName;
 
 import org.jboss.ejb3.Ejb3Registry;
 import org.jboss.ejb3.timerservice.TimedObjectInvoker;
@@ -53,25 +52,25 @@
    //private String jobGroup;
    private String triggerName;
    private String triggerGroup;
-   private ObjectName objectName;
+   private String containerGuid;
    
    private Serializable info;
    
-   protected PersistentTimer(Trigger trigger, ObjectName objectName, Serializable info)
+   protected PersistentTimer(Trigger trigger, String containerGuid, Serializable info)
    {
       assert trigger != null;
-      assert objectName != null;
+      assert containerGuid != null;
       
       this.triggerName = trigger.getName();
       this.triggerGroup = trigger.getGroup();
-      this.objectName = objectName;
       this.info = info;
+      this.containerGuid = containerGuid;
    }
    
    protected TimedObjectInvoker getTimedObjectInvoker()
    {
       // TODO: a hack to get back the container. This needs thinking.
-      TimedObjectInvoker invoker = (TimedObjectInvoker) Ejb3Registry.getContainer(objectName.getCanonicalName());
+      TimedObjectInvoker invoker = (TimedObjectInvoker) Ejb3Registry.getContainer(containerGuid);
       assert invoker != null;
       return invoker;
    }

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java	2007-07-24 23:15:52 UTC (rev 64266)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/timerservice/quartz/QuartzTimerServiceFactory.java	2007-07-24 23:57:47 UTC (rev 64267)
@@ -27,7 +27,6 @@
 import java.util.Properties;
 
 import javax.ejb.TimerService;
-import javax.management.ObjectName;
 import javax.naming.InitialContext;
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;
@@ -159,7 +158,7 @@
       Scheduler scheduler = getScheduler();
       if (scheduler == null) return null;
       
-      return new TimerServiceImpl(scheduler, container.getObjectName(), invoker);
+      return new TimerServiceImpl(scheduler, container, invoker);
    }
    
    private boolean execute(Connection conn, String stmtName) throws SQLException