Attachment 909915 Details for Bug 1100599 – Tomcat 6 patch

[patch] Tomcat 6 patch

tomcat6-ClearRefsLogAsInfo (text/plain), 9.49 KB, created by Rémy Maucherat on 2014-06-18 09:44:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rémy Maucherat

Created: 2014-06-18 09:44:23 UTC

Size: 9.49 KB

patch

obsolete

>Index: java/org/apache/catalina/loader/WebappClassLoader.java
>===================================================================
>--- java/org/apache/catalina/loader/WebappClassLoader.java	(revision 1602018)
>+++ java/org/apache/catalina/loader/WebappClassLoader.java	(working copy)
>@@ -1995,12 +1995,12 @@
>             List<String> driverNames = (List<String>) obj.getClass().getMethod(
>                     "clearJdbcDriverRegistrations").invoke(obj);
>             for (String name : driverNames) {
>-                log.error(sm.getString("webappClassLoader.clearJbdc",
>+                log.info(sm.getString("webappClassLoader.clearJbdc",
>                         contextName, name));
>             }
>         } catch (Exception e) {
>             // So many things to go wrong above...
>-            log.warn(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.jdbcRemoveFailed", contextName), e);
>         } finally {
>             if (is != null) {
>@@ -2007,7 +2007,7 @@
>                 try {
>                     is.close();
>                 } catch (IOException ioe) {
>-                    log.warn(sm.getString(
>+                    log.info(sm.getString(
>                             "webappClassLoader.jdbcRemoveStreamError",
>                             contextName), ioe);
>                 }
>@@ -2186,10 +2186,10 @@
>                     }
> 
>                     if (isRequestThread(thread)) {
>-                        log.error(sm.getString("webappClassLoader.warnRequestThread",
>+                        log.info(sm.getString("webappClassLoader.warnRequestThread",
>                                 contextName, thread.getName()));
>                     } else {
>-                        log.error(sm.getString("webappClassLoader.warnThread",
>+                        log.info(sm.getString("webappClassLoader.warnThread",
>                                 contextName, thread.getName()));
>                     }
>                     
>@@ -2235,19 +2235,19 @@
>                             }
>                         }
>                     } catch (SecurityException e) {
>-                        log.warn(sm.getString(
>+                        log.info(sm.getString(
>                                 "webappClassLoader.stopThreadFail",
>                                 thread.getName(), contextName), e);
>                     } catch (NoSuchFieldException e) {
>-                        log.warn(sm.getString(
>+                        log.info(sm.getString(
>                                 "webappClassLoader.stopThreadFail",
>                                 thread.getName(), contextName), e);
>                     } catch (IllegalArgumentException e) {
>-                        log.warn(sm.getString(
>+                        log.info(sm.getString(
>                                 "webappClassLoader.stopThreadFail",
>                                 thread.getName(), contextName), e);
>                     } catch (IllegalAccessException e) {
>-                        log.warn(sm.getString(
>+                        log.info(sm.getString(
>                                 "webappClassLoader.stopThreadFail",
>                                 thread.getName(), contextName), e);
>                     }
>@@ -2330,19 +2330,19 @@
>                 }
>             }
> 
>-            log.error(sm.getString("webappClassLoader.warnTimerThread",
>+            log.info(sm.getString("webappClassLoader.warnTimerThread",
>                     contextName, thread.getName()));
> 
>         } catch (IllegalAccessException e) {
>-            log.warn(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.stopTimerThreadFail",
>                     thread.getName(), contextName), e);
>         } catch (NoSuchMethodException e) {
>-            log.warn(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.stopTimerThreadFail",
>                     thread.getName(), contextName), e);
>         } catch (InvocationTargetException e) {
>-            log.warn(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.stopTimerThreadFail",
>                     thread.getName(), contextName), e);
>         }
>@@ -2390,25 +2390,25 @@
>                 }
>             }
>         } catch (SecurityException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         } catch (NoSuchFieldException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         } catch (ClassNotFoundException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         } catch (IllegalArgumentException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         } catch (IllegalAccessException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         } catch (NoSuchMethodException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         } catch (InvocationTargetException e) {
>-            log.warn(sm.getString("webappClassLoader.clearThreadLocalFail",
>+            log.info(sm.getString("webappClassLoader.clearThreadLocalFail",
>                     contextName), e);
>         }       
>     }
>@@ -2456,7 +2456,7 @@
>                                 try {
>                                     args[2] = key.toString();
>                                 } catch (Exception e) {
>-                                    log.error(sm.getString(
>+                                    log.info(sm.getString(
>                                             "webappClassLoader.clearThreadLocal.badKey",
>                                             args[1]), e);
>                                     args[2] = sm.getString(
>@@ -2468,7 +2468,7 @@
>                                 try {
>                                     args[4] = value.toString();
>                                 } catch (Exception e) {
>-                                    log.error(sm.getString(
>+                                    log.info(sm.getString(
>                                             "webappClassLoader.clearThreadLocal.badValue",
>                                             args[3]), e);
>                                     args[4] = sm.getString(
>@@ -2486,7 +2486,7 @@
>                                     }
>                                 }
>                             } else {
>-                                log.error(sm.getString(
>+                                log.info(sm.getString(
>                                         "webappClassLoader.clearThreadLocal",
>                                         args));
>                                 if (clearReferencesThreadLocals) {
>@@ -2622,16 +2622,16 @@
>             log.info(sm.getString("webappClassLoader.clearRmiInfo",
>                     contextName), e);
>         } catch (SecurityException e) {
>-            log.warn(sm.getString("webappClassLoader.clearRmiFail",
>+            log.info(sm.getString("webappClassLoader.clearRmiFail",
>                     contextName), e);
>         } catch (NoSuchFieldException e) {
>-            log.warn(sm.getString("webappClassLoader.clearRmiFail",
>+            log.info(sm.getString("webappClassLoader.clearRmiFail",
>                     contextName), e);
>         } catch (IllegalArgumentException e) {
>-            log.warn(sm.getString("webappClassLoader.clearRmiFail",
>+            log.info(sm.getString("webappClassLoader.clearRmiFail",
>                     contextName), e);
>         } catch (IllegalAccessException e) {
>-            log.warn(sm.getString("webappClassLoader.clearRmiFail",
>+            log.info(sm.getString("webappClassLoader.clearRmiFail",
>                     contextName), e);
>         }
>     }
>@@ -2699,12 +2699,12 @@
>                         Integer.valueOf(countRemoved), contextName));
>             }
>         } catch (SecurityException e) {
>-            log.error(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.clearReferencesResourceBundlesFail",
>                     contextName), e);
>         } catch (NoSuchFieldException e) {
>             if (System.getProperty("java.vendor").startsWith("Sun")) {
>-                log.error(sm.getString(
>+                log.info(sm.getString(
>                 "webappClassLoader.clearReferencesResourceBundlesFail",
>                 contextName), e);
>             } else {
>@@ -2713,11 +2713,11 @@
>                 contextName), e);
>             }
>         } catch (IllegalArgumentException e) {
>-            log.error(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.clearReferencesResourceBundlesFail",
>                     contextName), e);
>         } catch (IllegalAccessException e) {
>-            log.error(sm.getString(
>+            log.info(sm.getString(
>                     "webappClassLoader.clearReferencesResourceBundlesFail",
>                     contextName), e);
>         }
>

Actions: View | Diff

Attachments on bug 1100599: 898574 | 909914 | 909915