Author: jfrederic.clere(a)jboss.com Date: 2014-03-13 12:21:30 -0400 (Thu, 13 Mar 2014) New Revision: 2389 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java Log: fix for BZ 1075695. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java 2014-03-13 14:48:38 UTC (rev 2388) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/NioServerSocketChannelFactory.java 2014-03-13 16:21:30 UTC (rev 2389) @@ -117,7 +117,10 @@ // theFactory = new DefaultNioServerSocketChannelFactory(threadGroup); - } + } else { + if (theFactory.threadGroup != threadGroup) + theFactory = new DefaultNioServerSocketChannelFactory(threadGroup); + } try { return (NioServerSocketChannelFactory) theFactory.clone();