You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/02/07 16:14:12 UTC
[tomcat] branch 9.0.x updated: Avoid code duplication for attributes
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f06b28b Avoid code duplication for attributes
f06b28b is described below
commit f06b28baf7cca13ea7907717acbe70906bf5d359
Author: remm <re...@apache.org>
AuthorDate: Fri Feb 7 17:12:53 2020 +0100
Avoid code duplication for attributes
The lack of default also cause cosmetic NPEs for store config.
---
.../tribes/membership/cloud/CloudMembershipProvider.java | 8 ++++----
.../catalina/tribes/membership/cloud/CloudMembershipService.java | 9 +++------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
index 9940673..f33aed6 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
+++ b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipProvider.java
@@ -100,13 +100,13 @@ public abstract class CloudMembershipProvider extends MembershipProviderBase imp
public void init(Properties properties) throws IOException {
startTime = Instant.now();
- connectionTimeout = Integer.parseInt(properties.getProperty("connectionTimeout", "1000"));
- readTimeout = Integer.parseInt(properties.getProperty("readTimeout", "1000"));
+ CloudMembershipService service = (CloudMembershipService) this.service;
+ connectionTimeout = service.getConnectTimeout();
+ readTimeout = service.getReadTimeout();
+ expirationTime = service.getExpirationTime();
localIp = InetAddress.getLocalHost().getHostAddress();
port = Integer.parseInt(properties.getProperty("tcpListenPort"));
-
- expirationTime = Long.parseLong(properties.getProperty("expirationTime", "5000"));
}
@Override
diff --git a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
index df08508..bcb213e 100644
--- a/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
+++ b/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
@@ -209,8 +209,7 @@ public class CloudMembershipService extends MembershipServiceBase
@Override
public int getConnectTimeout() {
- String connectTimeout = properties.getProperty("connectTimeout");
- return Integer.parseInt(connectTimeout);
+ return Integer.parseInt(properties.getProperty("connectTimeout", "1000"));
}
public void setConnectTimeout(int connectTimeout) {
@@ -219,8 +218,7 @@ public class CloudMembershipService extends MembershipServiceBase
@Override
public int getReadTimeout() {
- String readTimeout = properties.getProperty("readTimeout");
- return Integer.parseInt(readTimeout);
+ return Integer.parseInt(properties.getProperty("readTimeout", "1000"));
}
public void setReadTimeout(int readTimeout) {
@@ -229,8 +227,7 @@ public class CloudMembershipService extends MembershipServiceBase
@Override
public long getExpirationTime() {
- String expirationTime = properties.getProperty("expirationTime");
- return Long.parseLong(expirationTime);
+ return Long.parseLong(properties.getProperty("expirationTime", "5000"));
}
public void setExpirationTime(long expirationTime) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org