From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Nov 2008 23:00:23 +0000 (+0000)
Subject: socket properties NPE fixes
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=085340a6c24e34d9dec792b3c6f177535c361f47;p=tomcat7.0

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 e36a178e1..a49567fce 100644
--- 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 2a3e17c3c..d061baa39 100644
--- 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