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

[Tom Elrod]

  User: telrod  
  Date: 07/02/07 10:14:50

  Modified:    src/main/org/jboss/remoting/detection  Tag: remoting_2_x
                        AbstractDetector.java
  Log:
  JBREM-700 - fix NPE on detection when there is no identity
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.27.2.1  +13 -5     JBossRemoting/src/main/org/jboss/remoting/detection/AbstractDetector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractDetector.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/detection/AbstractDetector.java,v
  retrieving revision 1.27
  retrieving revision 1.27.2.1
  diff -u -b -r1.27 -r1.27.2.1
  --- AbstractDetector.java	11 Oct 2006 20:18:55 -0000	1.27
  +++ AbstractDetector.java	7 Feb 2007 15:14:50 -0000	1.27.2.1
  @@ -54,7 +54,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.27 $
  + * @version $Revision: 1.27.2.1 $
    */
   public abstract class AbstractDetector implements AbstractDetectorMBean
   {
  @@ -511,10 +511,18 @@
   
      protected boolean isRemoteDetection(Detection detection)
      {
  -      String domain = detection.getIdentity().getDomain();
  +      String domain = null;
  +      if(detection != null)
  +      {
  +         Identity identity = detection.getIdentity();
  +         if(identity != null)
  +         {
  +            domain = identity.getDomain();
  +         }
  +      }
         // is detection domain in accepted domain collection and not local
         // if domains empty, then accept all
  -      return (domains.isEmpty() || domains.contains(domain)) &&
  +      return (domain == null || domains.isEmpty() || domains.contains(domain)) &&
                (acceptLocal ? true : (myself.isSameJVM(detection.getIdentity()) == false));
      }