tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r417038 - in /tomcat/container/tc5.5.x/modules/groupcom: VERSION src/share/org/apache/catalina/tribes/membership/McastService.java
Date Sun, 25 Jun 2006 18:43:50 GMT
Author: fhanik
Date: Sun Jun 25 11:43:49 2006
New Revision: 417038

URL: http://svn.apache.org/viewvc?rev=417038&view=rev
Log:
Fixed bug with member startup sequence

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

Modified: tomcat/container/tc5.5.x/modules/groupcom/VERSION
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/VERSION?rev=417038&r1=417037&r2=417038&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/VERSION (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/VERSION Sun Jun 25 11:43:49 2006
@@ -1,3 +1,5 @@
+0.9.3.1
+  - fixed a bug in the startup sequence. If the local member gets created, then we need to
set the unique Id
 0.9.3.0
   - fixed bugs
 0.9.2.9

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=417038&r1=417037&r2=417038&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
Sun Jun 25 11:43:49 2006
@@ -150,6 +150,7 @@
                 localMember.setPort(listenPort);
             } else {
                 localMember = new MemberImpl(listenHost, listenPort, 0);
+                localMember.setUniqueId(UUIDGenerator.randomUUID(true));
             }
             localMember.getData(true, true);
         }catch ( IOException x ) {
@@ -235,13 +236,13 @@
         
         if ( localMember == null ) {
             localMember = new MemberImpl(host, port, 100);
+            localMember.setUniqueId(UUIDGenerator.randomUUID(true));
         } else {
             localMember.setHostname(host);
             localMember.setPort(port);
             localMember.setMemberAliveTime(100);
         }
         if ( this.payload != null ) localMember.setPayload(payload);
-        localMember.setUniqueId(UUIDGenerator.randomUUID(true));
         localMember.setServiceStartTime(System.currentTimeMillis());
         java.net.InetAddress bind = null;
         if ( properties.getProperty("mcastBindAddress")!= null ) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message