Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java

@@ -13,6 +13,7 @@
 
 package org.eclipse.jetty.io;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -23,7 +24,7 @@ import java.nio.ByteBuffer;
  *
  * A transport EndPoint
  */
-public interface EndPoint
+public interface EndPoint extends Closeable
 {
     /* ------------------------------------------------------------ */
     /**

jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java

@@ -93,7 +93,16 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements Runnable,
 
     private void scheduleIdleTimeout(long delay)
     {
-        Future<?> newTimeout = isOpen() && delay > 0 ? _scheduler.schedule(_idleTask, delay, TimeUnit.MILLISECONDS) : null;
+        Future<?> newTimeout = null;
+        if (isOpen() && delay > 0)
+        {
+            LOG.debug("{} scheduling idle timeout in {} ms", this, delay);
+            newTimeout = _scheduler.schedule(_idleTask, delay, TimeUnit.MILLISECONDS);
+        }
+        else
+        {
+            LOG.debug("{} skipped scheduling idle timeout ({} ms)", this, delay);
+        }
         Future<?> oldTimeout = _timeout.getAndSet(newTimeout);
         if (oldTimeout != null)
             oldTimeout.cancel(false);
@@ -145,12 +154,16 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements Runnable,
             long idleElapsed = System.currentTimeMillis() - idleTimestamp;
             long idleLeft = idleTimeout - idleElapsed;
 
+            LOG.debug("{} idle timeout check, elapsed: {} ms, remaining: {} ms", this, idleElapsed, idleLeft);
+
             if (isOutputShutdown() || _readInterest.isInterested() || _writeFlusher.isWriting())
             {
                 if (idleTimestamp != 0 && idleTimeout > 0)
                 {
-                    if (idleLeft < 0)
+                    if (idleLeft <= 0)
                     {
+                        LOG.debug("{} idle timeout expired", this);
+
                         if (isOutputShutdown())
                             close();
                         notIdle();
@@ -207,6 +220,12 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements Runnable,
         catch (CancelledKeyException x)
         {
             LOG.debug("Ignoring key update for concurrently closed channel {}", this);
+            close();
+        }
+        catch (Exception x)
+        {
+            LOG.warn("Ignoring key update for " + this, x);
+            close();
         }
     }
 

jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java

@@ -13,13 +13,13 @@
 
 package org.eclipse.jetty.io;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
@@ -336,16 +336,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
                 _thread.setName(name + " Selector" + _id);
                 LOG.debug("Starting {} on {}", _thread, this);
                 while (isRunning())
-                {
-                    try
-                    {
                     select();
-                    }
-                    catch (IOException e)
-                    {
-                        LOG.warn(e);
-                    }
-                }
                 processChanges();
             }
             finally
@@ -358,10 +349,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
         /**
          * <p>Process changes and waits on {@link Selector#select()}.</p>
          *
-         * @throws IOException if the select operation fails
          * @see #submit(Runnable)
          */
-        public void select() throws IOException
+        public void select()
         {
             boolean debug = LOG.isDebugEnabled();
             try
@@ -379,32 +369,22 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
                 Set<SelectionKey> selectedKeys = _selector.selectedKeys();
                 for (SelectionKey key : selectedKeys)
                 {
-                    try
+                    if (key.isValid())
                     {
-                        if (!key.isValid())
+                        processKey(key);
+                    }
+                    else
                     {
                         if (debug)
                             LOG.debug("Selector loop ignoring invalid key for channel {}", key.channel());
-                            continue;
+                        Object attachment = key.attachment();
-                        }
+                        if (attachment instanceof EndPoint)
-
+                            ((EndPoint)attachment).close();
-                        processKey(key);
-                    }
-                    catch (Exception x)
-                    {
-                        if (isRunning())
-                            LOG.warn(x);
-                        else
-                            LOG.debug(x);
-
-                        execute(new Close(key));
                     }
                 }
-
-                // Everything always handled
                 selectedKeys.clear();
             }
-            catch (ClosedSelectorException x)
+            catch (IOException x)
             {
                 if (isRunning())
                     LOG.warn(x);
@@ -429,9 +409,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
 
         private void processKey(SelectionKey key)
         {
+            Object attachment = key.attachment();
             try
             {
-                Object attachment = key.attachment();
                 if (attachment instanceof SelectableAsyncEndPoint)
                 {
                     key.interestOps(0);
@@ -458,7 +438,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
                     catch (Exception x)
                     {
                         connectionFailed(channel, x, attachment);
-                        key.cancel();
+                        closeNoExceptions(channel);
                     }
                 }
                 else
@@ -468,7 +448,27 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
             }
             catch (CancelledKeyException x)
             {
-                LOG.debug("Ignoring cancelled key for channel", key.channel());
+                LOG.debug("Ignoring cancelled key for channel {}", key.channel());
+                if (attachment instanceof EndPoint)
+                    ((EndPoint)attachment).close();
+            }
+            catch (Exception x)
+            {
+                LOG.warn("Could not process key for channel " + key.channel(), x);
+                if (attachment instanceof EndPoint)
+                    ((EndPoint)attachment).close();
+            }
+        }
+
+        private void closeNoExceptions(Closeable closeable)
+        {
+            try
+            {
+                closeable.close();
+            }
+            catch (IOException x)
+            {
+                LOG.ignore(x);
             }
         }
 
@@ -643,29 +643,6 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
             }
         }
 
-        private class Close implements Runnable
-        {
-            private final SelectionKey key;
-
-            private Close(SelectionKey key)
-            {
-                this.key = key;
-            }
-
-            @Override
-            public void run()
-            {
-                try
-                {
-                    key.channel().close();
-                }
-                catch (IOException x)
-                {
-                    LOG.ignore(x);
-                }
-            }
-        }
-
         private class Stop implements Runnable
         {
             private final CountDownLatch latch = new CountDownLatch(1);
@@ -685,11 +662,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
                         }
                     }
 
-                    _selector.close();
+                    closeNoExceptions(_selector);
-                }
-                catch (IOException x)
-                {
-                    LOG.ignore(x);
                 }
                 finally
                 {

jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java

@@ -1,18 +1,11 @@
 package org.eclipse.jetty.io;
 
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
-
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
@@ -27,6 +20,12 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 
 public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
 {
@@ -60,6 +59,8 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
 
         AsyncConnection appConnection = super.newConnection(channel,sslConnection.getSslEndPoint());
         sslConnection.getSslEndPoint().setAsyncConnection(appConnection);
+        _manager.connectionOpened(appConnection);
+
         return sslConnection;
     }
 

jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java

@@ -56,9 +56,9 @@ public class SslConnectionTest
 
             AsyncConnection appConnection = new TestConnection(sslConnection.getSslEndPoint());
             sslConnection.getSslEndPoint().setAsyncConnection(appConnection);
+            connectionOpened(appConnection);
 
             return sslConnection;
-
         }
 
         @Override

jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java

@@ -15,7 +15,6 @@ package org.eclipse.jetty.server.ssl;
 
 import java.io.IOException;
 import java.nio.channels.SocketChannel;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLSession;
@@ -540,6 +539,7 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
             SslConnection connection = newSslConnection(endpoint, engine);
             AsyncConnection delegate = newPlainConnection(channel, connection.getSslEndPoint());
             connection.getSslEndPoint().setAsyncConnection(delegate);
+            getSelectorManager().connectionOpened(delegate);
             return connection;
         }
         catch (IOException e)

jetty-spdy/spdy-jetty/src/main/java/org/eclipse/jetty/spdy/SPDYAsyncConnection.java

@@ -120,9 +120,9 @@ public class SPDYAsyncConnection extends AbstractAsyncConnection implements Cont
     @Override
     protected boolean onReadTimeout()
     {
-        if(idle)
+        if (idle)
             session.goAway();
-        return idle;
+        return false;
     }
 
     protected Session getSession()

jetty-spdy/spdy-jetty/src/test/resources/log4j.properties

@@ -12,5 +12,4 @@ log4j.appender.CONSOLE.target=System.err
 # Level tuning
 log4j.logger.org.eclipse.jetty=INFO
 #log4j.logger.org.eclipse.jetty.io=DEBUG
-log4j.logger.org.eclipse.jetty.spdy=DEBUG
+#log4j.logger.org.eclipse.jetty.spdy=DEBUG
-# thomas