You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2008/11/18 00:00:23 UTC
svn commit: r718428 - in /tomcat/trunk/java/org/apache:
coyote/http11/Http11NioProtocol.java tomcat/util/net/SocketProperties.java
Author: fhanik
Date: Mon Nov 17 15:00:23 2008
New Revision: 718428
URL: http://svn.apache.org/viewvc?rev=718428&view=rev
Log:
socket properties NPE fixes
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=718428&r1=718427&r2=718428&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Nov 17 15:00:23 2008
@@ -761,8 +761,8 @@
public Http11NioProcessor createProcessor() {
Http11NioProcessor processor = new Http11NioProcessor(
- proto.ep.getSocketProperties().getRxBufSize(),
- proto.ep.getSocketProperties().getTxBufSize(),
+ 0,
+ 0,
proto.maxHttpHeaderSize,
proto.ep);
processor.setAdapter(proto.adapter);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java?rev=718428&r1=718427&r2=718428&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketProperties.java Mon Nov 17 15:00:23 2008
@@ -134,9 +134,9 @@
protected Integer soLingerTime = null;
/**
- * SO_TIMEOUT option. JVM default used if not set.
+ * SO_TIMEOUT option. default is 20000.
*/
- protected Integer soTimeout = null;
+ protected Integer soTimeout = new Integer(20000);
/**
* Traffic class option, value between 0 and 255
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org