From 5025219f869010840a985c18ca91fe406a783746 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 19 Nov 2009 14:05:56 +0000
Subject: [PATCH] Fix the Eclipse warnings - no functional change

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882151 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tomcat/util/net/jsse/JSSESocketFactory.java  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index cd6401ad7..c4265cf4e 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -116,6 +116,7 @@ public class JSSESocketFactory
 
 
     public JSSESocketFactory () {
+        // NOOP
     }
 
     @Override
@@ -207,7 +208,7 @@ public class JSSESocketFactory
     protected String[] getEnabledCiphers(String requestedCiphers,
                                          String[] supportedCiphers) {
 
-        String[] enabledCiphers = null;
+        String[] result = null;
 
         if (requestedCiphers != null) {
             Vector<String> vec = null;
@@ -261,14 +262,14 @@ public class JSSESocketFactory
             }           
 
             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 @@ public class JSSESocketFactory
 
         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 @@ public class JSSESocketFactory
                 try{
                     is.close();
                 } catch(Exception ex) {
+                    // Ignore
                 }
             }
         }
-- 
2.11.0