don't log io exception if the connector is not running

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

diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index 7f2af0f..eac333e 100644 (file)
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -318,6 +318,8 @@ public class JIoEndpoint {
                             // Ignore
                         }
                     }
+                }catch ( IOException x ) {
+                    if ( running ) log.error(sm.getString("endpoint.accept.fail"), x);
                 } catch (Throwable t) {
                     log.error(sm.getString("endpoint.accept.fail"), t);
                 }

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 79c7760..39762b5 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -1192,6 +1192,8 @@ public class NioEndpoint {
                             }
                         } 
                     }
+                }catch ( IOException x ) {
+                    if ( running ) log.error(sm.getString("endpoint.accept.fail"), x);
                 } catch (OutOfMemoryError oom) {
                     try {
                         oomParachuteData = null;
@@ -2126,6 +2128,7 @@ public class NioEndpoint {
         }
 
     }
+    
     // ---------------------------------------------- TaskQueue Inner Class
     public static class TaskQueue extends LinkedBlockingQueue<Runnable> {
         ThreadPoolExecutor parent = null;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 15df701..1070a21 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -18,6 +18,9 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>41530  </bug>Don't log error messages when connector is stopped (fhanik)
+      </fix>
+      <fix>
         <bug>41166</bug> Invalid handling when using replicated context (fhanik)
       </fix>
       <add>