jetty-9 work in progress

This commit is contained in:
Greg Wilkins 2012-05-09 13:30:27 +02:00
parent 2b9ff87e02
commit a7154fcb05
3 changed files with 5 additions and 30 deletions

View File

@ -487,6 +487,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
} }
else if (change instanceof ChangeTask) else if (change instanceof ChangeTask)
{ {
LOG.warn("DO WE NEED THIS????");
((Runnable)change).run(); ((Runnable)change).run();
} }
else if (change instanceof Runnable) else if (change instanceof Runnable)

View File

@ -1,26 +0,0 @@
// ========================================================================
// Copyright (c) 2006-2009 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.server.nio;
/**
* NIOConnector.
* A marker interface that indicates that NIOBuffers can be handled (efficiently) by this Connector.
*
*
*
*/
public interface NIOConnector
{
boolean getUseDirectBuffers();
}

View File

@ -247,26 +247,26 @@ public class SelectChannelConnector extends AbstractHttpConnector
} }
@Override @Override
protected void endPointClosed(SelectChannelEndPoint endpoint) protected void endPointClosed(AsyncEndPoint endpoint)
{ {
SelectChannelConnector.this.endPointClosed(endpoint); SelectChannelConnector.this.endPointClosed(endpoint);
} }
@Override @Override
protected void endPointOpened(SelectChannelEndPoint endpoint) protected void endPointOpened(AsyncEndPoint endpoint)
{ {
// TODO handle max connections and low resources // TODO handle max connections and low resources
connectionOpened(endpoint.getAsyncConnection()); connectionOpened(endpoint.getAsyncConnection());
} }
@Override @Override
protected void endPointUpgraded(SelectChannelEndPoint endpoint, AsyncConnection oldConnection) protected void endPointUpgraded(AsyncEndPoint endpoint, AsyncConnection oldConnection)
{ {
connectionUpgraded(oldConnection,endpoint.getAsyncConnection()); connectionUpgraded(oldConnection,endpoint.getAsyncConnection());
} }
@Override @Override
public AsyncConnection newConnection(SocketChannel channel, SelectChannelEndPoint endpoint, Object attachment) public AsyncConnection newConnection(SocketChannel channel, AsyncEndPoint endpoint, Object attachment)
{ {
return SelectChannelConnector.this.newConnection(channel,endpoint); return SelectChannelConnector.this.newConnection(channel,endpoint);
} }