[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting ...

[Tom Elrod]

  User: telrod  
  Date: 06/11/07 17:02:12

  Modified:    src/main/org/jboss/remoting  Tag: remoting_2_x
                        ServerInvoker.java
  Log:
  JBREM-629 - fixes for NPE within Lease when notifies of client lost
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.52.2.3  +12 -5     JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/ServerInvoker.java,v
  retrieving revision 1.52.2.2
  retrieving revision 1.52.2.3
  diff -u -b -r1.52.2.2 -r1.52.2.3
  --- ServerInvoker.java	7 Nov 2006 16:19:30 -0000	1.52.2.2
  +++ ServerInvoker.java	7 Nov 2006 22:02:12 -0000	1.52.2.3
  @@ -58,7 +58,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
  - * @version $Revision: 1.52.2.2 $
  + * @version $Revision: 1.52.2.3 $
    */
   public abstract class ServerInvoker extends AbstractInvoker implements ServerInvokerMBean
   {
  @@ -541,6 +541,8 @@
   
      public void addConnectionListener(ConnectionListener listener)
      {
  +      if(listener != null)
  +      {
         connectionNotifier.addListener(listener);
   
         if(leasePeriod > 0)
  @@ -548,6 +550,11 @@
            leaseManagement = true;
         }
      }
  +      else
  +      {
  +         throw new IllegalArgumentException("Can not add null ConnectionListener.");
  +      }
  +   }
   
      public void removeConnectionListener(ConnectionListener listener)
      {