From 8bd6ab0bebf027df38a71b3b1b52dcc140a03875 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 16 Oct 2013 16:36:23 +0200
Subject: [PATCH] Removed class SocketBased, not necessary.

---
 .../org/eclipse/jetty/io/ChannelEndPoint.java |  3 +-
 .../org/eclipse/jetty/io/SocketBased.java     | 29 -------------------
 .../eclipse/jetty/io/ssl/SslConnection.java   | 15 ----------
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 jetty-io/src/main/java/org/eclipse/jetty/io/SocketBased.java

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
index 166748a5439..f69af7f14e1 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
@@ -35,7 +35,7 @@ import org.eclipse.jetty.util.thread.Scheduler;
  * Channel End Point.
  * <p>Holds the channel and socket for an NIO endpoint.
  */
-public class ChannelEndPoint extends AbstractEndPoint implements SocketBased
+public class ChannelEndPoint extends AbstractEndPoint
 {
     private static final Logger LOG = Log.getLogger(ChannelEndPoint.class);
 
@@ -208,7 +208,6 @@ public class ChannelEndPoint extends AbstractEndPoint implements SocketBased
         return _channel;
     }
 
-    @Override
     public Socket getSocket()
     {
         return _socket;
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SocketBased.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SocketBased.java
deleted file mode 100644
index f6e17eb8413..00000000000
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SocketBased.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.io;
-
-import java.net.Socket;
-
-/**
- * Interface for Socket based I/O
- */
-public interface SocketBased
-{
-    public Socket getSocket();
-}
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 43a99696565..fc477c040e2 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
@@ -107,21 +107,6 @@ public class SslConnection extends AbstractConnection
         this._bufferPool = byteBufferPool;
         this._sslEngine = sslEngine;
         this._decryptedEndPoint = newDecryptedEndPoint();
-
-        // 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()