socket properties NPE fixes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@718428 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index e36a178..a49567f 100644 (file)
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -761,8 +761,8 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
 
         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);

diff --git a/java/org/apache/tomcat/util/net/SocketProperties.java b/java/org/apache/tomcat/util/net/SocketProperties.java
index 2a3e17c..d061baa 100644 (file)
--- a/java/org/apache/tomcat/util/net/SocketProperties.java
+++ b/java/org/apache/tomcat/util/net/SocketProperties.java
@@ -134,9 +134,9 @@ public class SocketProperties {
     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