Author: markt Date: Mon May 23 15:29:16 2016 New Revision: 1745218 URL: http://svn.apache.org/viewvc?rev=1745218&view=rev Log: Clean-up. No functional change. Use multi-catch Use longer lines
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1745218&r1=1745217&r2=1745218&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon May 23 15:29:16 2016 @@ -1606,15 +1606,12 @@ public abstract class WebappClassLoaderB // JVM controlled threads ThreadGroup tg = thread.getThreadGroup(); - if (tg != null && - JVM_THREAD_GROUP_NAMES.contains(tg.getName())) { - + if (tg != null && JVM_THREAD_GROUP_NAMES.contains(tg.getName())) { // HttpClient keep-alive threads if (clearReferencesHttpClientKeepAliveThread && threadName.equals("Keep-Alive-Timer")) { thread.setContextClassLoader(parent); - log.debug(sm.getString( - "webappClassLoader.checkThreadsHttpClient")); + log.debug(sm.getString("webappClassLoader.checkThreadsHttpClient")); } // Don't warn about remaining JVM controlled threads @@ -1659,11 +1656,9 @@ public abstract class WebappClassLoaderB // "runnable" in IBM JDK // "action" in Apache Harmony Object target = null; - for (String fieldName : new String[] { "target", - "runnable", "action" }) { + for (String fieldName : new String[] { "target", "runnable", "action" }) { try { - Field targetField = thread.getClass() - .getDeclaredField(fieldName); + Field targetField = thread.getClass().getDeclaredField(fieldName); targetField.setAccessible(true); target = targetField.get(thread); break; @@ -1674,12 +1669,10 @@ public abstract class WebappClassLoaderB // "java.util.concurrent" code is in public domain, // so all implementations are similar - if (target != null && - target.getClass().getCanonicalName() != null - && target.getClass().getCanonicalName().equals( - "java.util.concurrent.ThreadPoolExecutor.Worker")) { - Field executorField = - target.getClass().getDeclaredField("this$0"); + if (target != null && target.getClass().getCanonicalName() != null && + target.getClass().getCanonicalName().equals( + "java.util.concurrent.ThreadPoolExecutor.Worker")) { + Field executorField = target.getClass().getDeclaredField("this$0"); executorField.setAccessible(true); Object executor = executorField.get(target); if (executor instanceof ThreadPoolExecutor) { @@ -1687,21 +1680,9 @@ public abstract class WebappClassLoaderB usingExecutor = true; } } - } catch (SecurityException e) { - log.warn(sm.getString( - "webappClassLoader.stopThreadFail", - thread.getName(), getContextName()), e); - } catch (NoSuchFieldException e) { - log.warn(sm.getString( - "webappClassLoader.stopThreadFail", - thread.getName(), getContextName()), e); - } catch (IllegalArgumentException e) { - log.warn(sm.getString( - "webappClassLoader.stopThreadFail", - thread.getName(), getContextName()), e); - } catch (IllegalAccessException e) { - log.warn(sm.getString( - "webappClassLoader.stopThreadFail", + } catch (SecurityException | NoSuchFieldException | IllegalArgumentException | + IllegalAccessException e) { + log.warn(sm.getString("webappClassLoader.stopThreadFail", thread.getName(), getContextName()), e); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org