Further minor clean-up of unused/unnecessary code after I made Eclipse even more...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@651978 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
index 1a02087..565fa20 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
@@ -53,4 +53,4 @@ public class JSSEFactory {
         return new JSSESupport(session);
     }
 
-};
+}

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index 16cece7..3928fbc 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -364,7 +364,7 @@ public class JSSESocketFactory
             // Certificate encoding algorithm (e.g., SunX509)
             String algorithm = (String) attributes.get("algorithm");
             if (algorithm == null) {
-                algorithm = KeyManagerFactory.getDefaultAlgorithm();;
+                algorithm = KeyManagerFactory.getDefaultAlgorithm();
             }
 
             String keystoreType = (String) attributes.get("keystoreType");

diff --git a/java/org/apache/tomcat/util/threads/ThreadPool.java b/java/org/apache/tomcat/util/threads/ThreadPool.java
index 473bdc8..899005f 100644 (file)
--- a/java/org/apache/tomcat/util/threads/ThreadPool.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPool.java
@@ -335,7 +335,7 @@ public class ThreadPool  {
                     int toOpen = currentThreadCount + minSpareThreads;
                     openThreads(toOpen);
                 } else {
-                    logFull(log, currentThreadCount, maxThreads);
+                    logFull(currentThreadCount, maxThreads);
                     // Wait for a thread to become idel.
                     try {
                         this.wait();
@@ -373,8 +373,7 @@ public class ThreadPool  {
         return c;
     }
 
-    private static void logFull(Log loghelper, int currentThreadCount,
-                                int maxThreads) {
+    private static void logFull(int currentThreadCount, int maxThreads) {
        if( logfull ) {
             log.error(sm.getString("threadpool.busy",
                                    new Integer(currentThreadCount),