tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r613265 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Date Fri, 18 Jan 2008 20:56:29 GMT
Author: markt
Date: Fri Jan 18 12:56:28 2008
New Revision: 613265

URL: http://svn.apache.org/viewvc?rev=613265&view=rev
Log:
Fix warnings. No functional change.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=613265&r1=613264&r2=613265&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Fri Jan 18 12:56:28
2008
@@ -171,7 +171,7 @@
         String[] enabledCiphers = null;
 
         if (requestedCiphers != null) {
-            Vector vec = null;
+            Vector<String> vec = null;
             String cipher = requestedCiphers;
             int index = requestedCiphers.indexOf(',');
             if (index != -1) {
@@ -187,7 +187,7 @@
                                      && i<supportedCiphers.length; i++) {
                             if (supportedCiphers[i].equals(cipher)) {
                                 if (vec == null) {
-                                    vec = new Vector();
+                                    vec = new Vector<String>();
                                 }
                                 vec.addElement(cipher);
                                 break;
@@ -211,7 +211,7 @@
                                  && i<supportedCiphers.length; i++) {
                         if (supportedCiphers[i].equals(cipher)) {
                             if (vec == null) {
-                                vec = new Vector();
+                                vec = new Vector<String>();
                             }
                             vec.addElement(cipher);
                             break;
@@ -476,7 +476,7 @@
         if("PKIX".equalsIgnoreCase(algorithm)) {
             PKIXBuilderParameters xparams = new PKIXBuilderParameters(trustStore, 
                                                                      new X509CertSelector());
-            Collection crls = getCRLs(crlf);
+            Collection<? extends CRL> crls = getCRLs(crlf);
             CertStoreParameters csp = new CollectionCertStoreParameters(crls);
             CertStore store = CertStore.getInstance("Collection", csp);
             xparams.addCertStore(store);
@@ -560,7 +560,7 @@
         String[] enabledProtocols = null;
 
         if (requestedProtocols != null) {
-            Vector vec = null;
+            Vector<String> vec = null;
             String protocol = requestedProtocols;
             int index = requestedProtocols.indexOf(',');
             if (index != -1) {
@@ -576,7 +576,7 @@
                                      && i<supportedProtocols.length; i++) {
                             if (supportedProtocols[i].equals(protocol)) {
                                 if (vec == null) {
-                                    vec = new Vector();
+                                    vec = new Vector<String>();
                                 }
                                 vec.addElement(protocol);
                                 break;
@@ -600,7 +600,7 @@
                                  && i<supportedProtocols.length; i++) {
                         if (supportedProtocols[i].equals(protocol)) {
                             if (vec == null) {
-                                vec = new Vector();
+                                vec = new Vector<String>();
                             }
                             vec.addElement(protocol);
                             break;



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


Mime
View raw message