[jbossweb-commits] JBossWeb SVN: r2238 - in branches/7.2.x/src/main/java/org: jboss/web and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2013-07-22 09:33:36 -0400 (Mon, 22 Jul 2013) New Revision: 2238 Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java Log: JBWEB-276: Move operations that use an executor to a separate category for possible filtering. Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/AprEndpoint.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -992,7 +992,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -1017,7 +1017,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -1042,7 +1042,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/JIoEndpoint.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -1220,7 +1220,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -1245,7 +1245,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; Modified: branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -462,7 +462,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } return true; @@ -487,7 +487,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } } @@ -504,7 +504,7 @@ } catch (Throwable t) { // This means we got an OOM or similar creating a thread, or that // the pool and its queue are full - CoyoteLogger.UTIL_LOGGER.errorProcessingSocket(t); + CoyoteLogger.NET_LOGGER.errorProcessingSocket(t); return false; } } Modified: branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java =================================================================== --- branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-07-12 07:18:47 UTC (rev 2237) +++ branches/7.2.x/src/main/java/org/jboss/web/CoyoteLogger.java 2013-07-22 13:33:36 UTC (rev 2238) @@ -53,6 +53,11 @@ /** * A logger with the category of the package name. */ + CoyoteLogger NET_LOGGER = Logger.getMessageLogger(CoyoteLogger.class, "org.apache.tomcat.util.net"); + + /** + * A logger with the category of the package name. + */ CoyoteLogger HTTP_LOGGER = Logger.getMessageLogger(CoyoteLogger.class, "org.apache.coyote.http11"); /**