From 4ad0b313c00a8ff4a6fb9a2410f6069b730138f3 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 27 Apr 2008 16:29:52 +0000 Subject: [PATCH] Further minor clean-up of unused/unnecessary code after I made Eclipse even more pedantic. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@651978 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/net/jsse/JSSEFactory.java | 2 +- java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java | 2 +- java/org/apache/tomcat/util/threads/ThreadPool.java | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java index 1a020872d..565fa203f 100644 --- 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 16cece72c..3928fbca9 100644 --- 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 473bdc809..899005fa1 100644 --- 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), -- 2.11.0