svn commit: r1843327 - in /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud: AbstractStreamProvider.java CloudMembershipService.java InsecureStreamProvider.java

[markt]

Author: markt
Date: Tue Oct  9 18:53:53 2018
New Revision: 1843327

URL: http://svn.apache.org/viewvc?rev=1843327&view=rev
Log:
Fix IDE warnings

Modified:
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
    
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/InsecureStreamProvider.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java?rev=1843327&r1=1843326&r2=1843327&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
 Tue Oct  9 18:53:53 2018
@@ -38,8 +38,11 @@ public abstract class AbstractStreamProv
 
     protected static final TrustManager[] INSECURE_TRUST_MANAGERS = new 
TrustManager[] {
             new X509TrustManager() {
+                @Override
                 public void checkClientTrusted(X509Certificate[] chain, String 
authType) throws CertificateException {}
+                @Override
                 public void checkServerTrusted(X509Certificate[] chain, String 
authType) throws CertificateException {}
+                @Override
                 public X509Certificate[] getAcceptedIssuers() {
                     return null;
                 }
@@ -57,7 +60,8 @@ public abstract class AbstractStreamProv
      */
     public URLConnection openConnection(String url, Map<String, String> 
headers, int connectTimeout, int readTimeout) throws IOException {
         if (log.isDebugEnabled()) {
-            log.debug(String.format("%s opening connection: url [%s], headers 
[%s], connectTimeout [%s], readTimeout [%s]", getClass().getSimpleName(), url, 
headers, connectTimeout, readTimeout));
+            log.debug(String.format("%s opening connection: url [%s], headers 
[%s], connectTimeout [%s], readTimeout [%s]",
+                    getClass().getSimpleName(), url, headers, 
Integer.toString(connectTimeout), Integer.toString(readTimeout)));
         }
         URLConnection connection = new URL(url).openConnection();
         if (headers != null) {
@@ -67,7 +71,8 @@ public abstract class AbstractStreamProv
         }
         if (connectTimeout < 0 || readTimeout < 0) {
             throw new IllegalArgumentException(
-                String.format("Neither connectTimeout [%s] nor readTimeout 
[%s] can be less than 0 for URLConnection.", connectTimeout, readTimeout));
+                String.format("Neither connectTimeout [%s] nor readTimeout 
[%s] can be less than 0 for URLConnection.",
+                        Integer.toString(connectTimeout), 
Integer.toString(readTimeout)));
         }
         connection.setConnectTimeout(connectTimeout);
         connection.setReadTimeout(readTimeout);

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java?rev=1843327&r1=1843326&r2=1843327&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CloudMembershipService.java
 Tue Oct  9 18:53:53 2018
@@ -146,7 +146,8 @@ public class CloudMembershipService exte
     @Override
     public void setLocalMemberProperties(String listenHost, int listenPort, 
int securePort, int udpPort) {
         if (log.isDebugEnabled()) {
-            log.debug(String.format("setLocalMemberProperties(%s, %d, %d, 
%d)", listenHost, listenPort, securePort, udpPort));
+            log.debug(String.format("setLocalMemberProperties(%s, %d, %d, 
%d)", listenHost,
+                    Integer.toString(listenPort), 
Integer.toString(securePort), Integer.toString(udpPort)));
         }
         properties.setProperty("tcpListenHost", listenHost);
         properties.setProperty("tcpListenPort", String.valueOf(listenPort));

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/InsecureStreamProvider.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/InsecureStreamProvider.java?rev=1843327&r1=1843326&r2=1843327&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/InsecureStreamProvider.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/InsecureStreamProvider.java
 Tue Oct  9 18:53:53 2018
@@ -35,6 +35,7 @@ public class InsecureStreamProvider exte
     private static final Log log = 
LogFactory.getLog(InsecureStreamProvider.class);
 
     private static final HostnameVerifier INSECURE_HOSTNAME_VERIFIER = new 
HostnameVerifier() {
+        @Override
         public boolean verify(String arg0, SSLSession arg1) {
             return true;
         }



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