aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-07-22 05:52:13 (EDT)
committerThomas Becker2013-07-22 05:52:13 (EDT)
commit8946b4946bc1b27ae9d168752fa2f1bf3c210a19 (patch)
tree350ddbf10862e79f7c8562ba19feba2d85963c8b
parentebfa3b97ba069c55b2205b104230635f1494f13b (diff)
downloadorg.eclipse.jetty.project-8946b4946bc1b27ae9d168752fa2f1bf3c210a19.zip
org.eclipse.jetty.project-8946b4946bc1b27ae9d168752fa2f1bf3c210a19.tar.gz
org.eclipse.jetty.project-8946b4946bc1b27ae9d168752fa2f1bf3c210a19.tar.bz2
SSLConnection comment out setting soLonger timeout to avoid threads stuck in preClose0
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java27
1 files changed, 14 insertions, 13 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
index 7342c91..b972ce9 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
@@ -19,7 +19,6 @@
package org.eclipse.jetty.io.ssl;
import java.io.IOException;
-import java.net.SocketException;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException;
import java.util.Arrays;
@@ -39,7 +38,6 @@ import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.io.FillInterest;
import org.eclipse.jetty.io.RuntimeIOException;
import org.eclipse.jetty.io.SelectChannelEndPoint;
-import org.eclipse.jetty.io.SocketBased;
import org.eclipse.jetty.io.WriteFlusher;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
@@ -110,17 +108,20 @@ public class SslConnection extends AbstractConnection
this._sslEngine = sslEngine;
this._decryptedEndPoint = newDecryptedEndPoint();
- if (endPoint instanceof SocketBased)
- {
- try
- {
- ((SocketBased)endPoint).getSocket().setSoLinger(true, 30000);
- }
- catch (SocketException e)
- {
- throw new RuntimeIOException(e);
- }
- }
+ // commented out for now as it might cause native code being stuck in preClose0.
+ // See: https://java.net/jira/browse/GRIZZLY-547
+
+// if (endPoint instanceof SocketBased)
+// {
+// try
+// {
+// ((SocketBased)endPoint).getSocket().setSoLinger(true, 30000);
+// }
+// catch (SocketException e)
+// {
+// throw new RuntimeIOException(e);
+// }
+// }
}
protected DecryptedEndPoint newDecryptedEndPoint()