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

[Ron Sigal]

  User: rsigal  
  Date: 07/03/27 04:21:24

  Modified:    src/main/org/jboss/remoting/detection/jndi  Tag:
                        remoting_2_x JNDIDetector.java
  Log:
  JBREM-730: (1) Does clean detection with first heartbeat; (2) binds detection messages in context with rebind().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.1  +3 -2      JBossRemoting/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JNDIDetector.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/detection/jndi/JNDIDetector.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -b -r1.14 -r1.14.2.1
  --- JNDIDetector.java	11 Oct 2006 20:20:13 -0000	1.14
  +++ JNDIDetector.java	27 Mar 2007 08:21:23 -0000	1.14.2.1
  @@ -78,7 +78,6 @@
   
      private Identity id;
      private Context context;
  -   private int cleanDetectionCount = 0;
   
      public static final String DETECTION_SUBCONTEXT_NAME = "detection";
   
  @@ -88,6 +87,7 @@
       * Indicates the number of time will detect before doing check to see if server still alive.
       */
      private int detectionNumber = 5;
  +   private int cleanDetectionCount = detectionNumber;
   
      protected final Logger log = Logger.getLogger(getClass());
      
  @@ -262,6 +262,7 @@
      public void setCleanDetectionNumber(int cleanDetectionNumber)
      {
         detectionNumber = cleanDetectionNumber;
  +      cleanDetectionCount = detectionNumber;
      }
   
      private void checkRemoteDetectionMsg()
  @@ -397,7 +398,7 @@
         {
            try
            {
  -            context.bind(sId, msg);
  +            context.rebind(sId, msg);
               log.info("Added " + sId + " to registry.");
            }
            catch(NameAlreadyBoundException nabex)