svn commit: r882151 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

[markt]

Author: markt
Date: Thu Nov 19 14:05:56 2009
New Revision: 882151

URL: http://svn.apache.org/viewvc?rev=882151&view=rev
Log:
Fix the Eclipse 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=882151&r1=882150&r2=882151&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 
Thu Nov 19 14:05:56 2009
@@ -116,6 +116,7 @@
 
 
     public JSSESocketFactory () {
+        // NOOP
     }
 
     @Override
@@ -207,7 +208,7 @@
     protected String[] getEnabledCiphers(String requestedCiphers,
                                          String[] supportedCiphers) {
 
-        String[] enabledCiphers = null;
+        String[] result = null;
 
         if (requestedCiphers != null) {
             Vector<String> vec = null;
@@ -261,14 +262,14 @@
             }           
 
             if (vec != null) {
-                enabledCiphers = new String[vec.size()];
-                vec.copyInto(enabledCiphers);
+                result = new String[vec.size()];
+                vec.copyInto(result);
             }
         } else {
-            enabledCiphers = sslProxy.getDefaultCipherSuites();
+            result = sslProxy.getDefaultCipherSuites();
         }
 
-        return enabledCiphers;
+        return result;
     }
      
     /*
@@ -526,11 +527,12 @@
 
         kms = kmf.getKeyManagers();
         if (keyAlias != null) {
+            String alias = keyAlias;
             if (JSSESocketFactory.defaultKeystoreType.equals(keystoreType)) {
-                keyAlias = keyAlias.toLowerCase();
+                alias = alias.toLowerCase();
             }
             for(int i=0; i<kms.length; i++) {
-                kms[i] = new JSSEKeyManager((X509KeyManager)kms[i], keyAlias);
+                kms[i] = new JSSEKeyManager((X509KeyManager)kms[i], alias);
             }
         }
 
@@ -636,6 +638,7 @@
                 try{
                     is.close();
                 } catch(Exception ex) {
+                    // Ignore
                 }
             }
         }



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