Author: markt
Date: Thu Jan 17 15:31:08 2013
New Revision: 1434725
URL: http://svn.apache.org/viewvc?rev=1434725&view=rev
Log:
socket can't be null here
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1434725&r1=1434724&r2=1434725&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu Jan 17
15:31:08 2013
@@ -2135,7 +2135,7 @@ public class AprEndpoint extends Abstrac
// Upgraded connections need to allow multiple threads to access
the
// connection at the same time to enable blocking IO to be used
when
// Servlet 3.1 NIO has been configured
- if (socket != null && socket.isUpgraded()) {
+ if (socket.isUpgraded()) {
doRun();
} else {
synchronized (socket) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
