Author: markt Date: Thu Jul 2 20:43:25 2015 New Revision: 1688906 URL: http://svn.apache.org/r1688906 Log: Simplify Setting socket to null is pointless Should set ka to null
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1688906&r1=1688905&r2=1688906&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Jul 2 20:43:25 2015 @@ -1522,29 +1522,21 @@ public class NioEndpoint extends Abstrac } if (state == SocketState.CLOSED) { close(socket, key); - socket = null; - ka = null; } } else if (handshake == -1 ) { close(socket, key); - socket = null; - ka = null; } else { ka.getPoller().add(socket,handshake); } } catch (CancelledKeyException cx) { - if (socket != null) { - socket.getPoller().cancelledKey(key); - } + socket.getPoller().cancelledKey(key); } catch (VirtualMachineError vme) { ExceptionUtils.handleThrowable(vme); } catch (Throwable t) { log.error("", t); - if (socket != null) { - socket.getPoller().cancelledKey(key); - } + socket.getPoller().cancelledKey(key); } finally { - socket = null; + ka = null; status = null; //return to cache if (running && !paused) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org