svn commit: r416853 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java

[fhanik]

Author: fhanik
Date: Fri Jun 23 19:00:01 2006
New Revision: 416853

URL: http://svn.apache.org/viewvc?rev=416853&view=rev
Log:
Be able to create the local member without actually starting the membership 
service

Modified:
    
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java?rev=416853&r1=416852&r2=416853&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
 Fri Jun 23 19:00:01 2006
@@ -134,7 +134,7 @@
      * Return the local member
      */
     public Member getLocalMember(boolean alive) {
-        if ( alive && localMember != null ) 
localMember.setMemberAliveTime(System.currentTimeMillis()-impl.getServiceStartTime());
+        if ( alive && localMember != null && impl != null) 
localMember.setMemberAliveTime(System.currentTimeMillis()-impl.getServiceStartTime());
         return localMember;
     }
     
@@ -148,8 +148,10 @@
             if (localMember != null) {
                 localMember.setHostname(listenHost);
                 localMember.setPort(listenPort);
-                localMember.getData(true, true);
+            } else {
+                localMember = new MemberImpl(listenHost, listenPort, 0);
             }
+            localMember.getData(true, true);
         }catch ( IOException x ) {
             throw new IllegalArgumentException(x);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]