[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 07/02/26 15:50:59

  Modified:    src/main/org/jboss/seam/core  Dispatcher.java
  Log:
  return null when the Timer is gone
  
  Revision  Changes    Path
  1.16      +12 -5     jboss-seam/src/main/org/jboss/seam/core/Dispatcher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Dispatcher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Dispatcher.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Dispatcher.java	21 Dec 2006 02:38:26 -0000	1.15
  +++ Dispatcher.java	26 Feb 2007 20:50:59 -0000	1.16
  @@ -361,10 +361,17 @@
           {
               Timer timer = (Timer) callInContext(new Callable() {
                       public Object call() {
  +                    try
  +                    {
                           return handle.getTimer();
                       }
  +                    catch (javax.ejb.NoSuchObjectLocalException nsoe)
  +                    {
  +                        return null;
  +                    }           
  +                }
                   });
  -            return new TimerProxy(timer);  
  +            return timer==null ? null : new TimerProxy(timer);  
           }
       }
   }