This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 40c7a7f Fix IDE warnings
40c7a7f is described below
commit 40c7a7f215c713a5bdee37432ea9d1c37dfdc74d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jul 26 14:38:20 2019 +0100
Fix IDE warnings
---
.../catalina/tribes/membership/cloud/AbstractStreamProvider.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
index 1aa68bf..1c0d60b 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.security.KeyStore;
+import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
@@ -119,8 +120,8 @@ public abstract class AbstractStreamProvider implements
StreamProvider {
KeyStore trustStore = KeyStore.getInstance("JKS");
trustStore.load(null);
- Collection c =
certFactory.generateCertificates(pemInputStream);
- Iterator i = c.iterator();
+ Collection<? extends Certificate> c =
certFactory.generateCertificates(pemInputStream);
+ Iterator<? extends Certificate> i = c.iterator();
while (i.hasNext()) {
X509Certificate cert = (X509Certificate)i.next();
String alias = cert.getSubjectX500Principal().getName();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
