From 78fb9016f2586fdf5579ea861e8a38fa370be365 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 21 May 2009 18:35:40 +0000
Subject: [PATCH] Consolidate the use of service start time into one local
 variable https://issues.apache.org/bugzilla/show_bug.cgi?id=47234

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@777210 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/tribes/membership/McastServiceImpl.java    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index 812b51b5d..11da4d448 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -115,11 +115,6 @@ public class McastServiceImpl
     protected SenderThread sender;
 
     /**
-     * When was the service started
-     */
-    protected long serviceStartTime = System.currentTimeMillis();
-    
-    /**
      * Time to live for the multicast packets that are being sent out
      */
     protected int mcastTTL = -1;
@@ -267,7 +262,6 @@ public class McastServiceImpl
             //make sure at least one packet gets out there
             send(false);
             doRunSender = true;
-            serviceStartTime = System.currentTimeMillis();
             sender = new SenderThread(sendFrequency);
             sender.setDaemon(true);
             sender.start();
@@ -324,7 +318,7 @@ public class McastServiceImpl
             //leave mcast group
             try {socket.leaveGroup(address);}catch ( Exception ignore){}
             try {socket.close();}catch ( Exception ignore){}
-            serviceStartTime = Long.MAX_VALUE;
+            member.setServiceStartTime(-1);
         }
         return (startLevel == 0);
     }
@@ -496,7 +490,7 @@ public class McastServiceImpl
     }
 
     public long getServiceStartTime() {
-       return this.serviceStartTime;
+        return (member!=null) ? member.getServiceStartTime() : -1l;
     }
 
     public int getRecoveryCounter() {
-- 
2.11.0