svn commit: r1831065 - in /tomcat/trunk: java/org/apache/catalina/tribes/membership/McastService.java webapps/docs/changelog.xml

[kfujino]

Author: kfujino
Date: Mon May  7 04:38:37 2018
New Revision: 1831065

URL: http://svn.apache.org/viewvc?rev=1831065&view=rev
Log:
Ensure that the correct default value is returned when retrieve unset 
properties in McastService.

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1831065&r1=1831064&r2=1831065&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
Mon May  7 04:38:37 2018
@@ -94,11 +94,7 @@ public class McastService
      */
     public McastService() {
         //default values
-        properties.setProperty("mcastPort","45564");
-        properties.setProperty("mcastAddress","228.0.0.4");
-        properties.setProperty("memberDropTime","3000");
-        properties.setProperty("mcastFrequency","500");
-
+        setDefaults(this.properties);
     }
 
     /**
@@ -122,6 +118,7 @@ public class McastService
         hasProperty(properties,"mcastFrequency");
         hasProperty(properties,"tcpListenPort");
         hasProperty(properties,"tcpListenHost");
+        setDefaults(properties);
         this.properties = properties;
     }
 
@@ -611,6 +608,26 @@ public class McastService
         this.channel = channel;
     }
 
+    protected void setDefaults(Properties properties) {
+        // default values
+        if (properties.getProperty("mcastPort") == null)
+            properties.setProperty("mcastPort","45564");
+        if (properties.getProperty("mcastAddress") == null)
+            properties.setProperty("mcastAddress","228.0.0.4");
+        if (properties.getProperty("memberDropTime") == null)
+            properties.setProperty("memberDropTime","3000");
+        if (properties.getProperty("mcastFrequency") == null)
+            properties.setProperty("mcastFrequency","500");
+        if (properties.getProperty("recoveryCounter") == null)
+            properties.setProperty("recoveryCounter", "10");
+        if (properties.getProperty("recoveryEnabled") == null)
+            properties.setProperty("recoveryEnabled", "true");
+        if (properties.getProperty("recoverySleepTime") == null)
+            properties.setProperty("recoverySleepTime", "5000");
+        if (properties.getProperty("localLoopbackDisabled") == null)
+            properties.setProperty("localLoopbackDisabled", "false");
+    }
+
     /**
      * Simple test program
      * @param args Command-line arguments

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1831065&r1=1831064&r2=1831065&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon May  7 04:38:37 2018
@@ -103,6 +103,14 @@
       </update>
     </changelog>
   </subsection>
+  <subsection name="Tribes">
+    <changelog>
+      <fix>
+        Ensure that the correct default value is returned when retrieve unset
+        properties in <code>McastService</code>. (kfujino)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 9.0.8 (markt)" rtext="2018-05-03">
   <subsection name="Catalina">



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