Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jetty9 - Fixed compilation issues.

This commit is contained in:
Simone Bordet 2012-09-06 09:37:11 +02:00
parent 4c26d98187
commit 236df8e94b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -31,9 +31,7 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import javax.net.ssl.SSLEngine;
import org.eclipse.jetty.client.api.Connection;
@ -55,6 +53,8 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.util.thread.TimerScheduler;
/**
* <p>{@link HttpClient} provides an efficient, asynchronous, non-blocking implementation
@ -96,7 +96,7 @@ public class HttpClient extends AggregateLifeCycle
private final ConcurrentMap<Long, HttpConversation> conversations = new ConcurrentHashMap<>();
private volatile Executor executor;
private volatile ByteBufferPool byteBufferPool;
private volatile ScheduledExecutorService scheduler;
private volatile Scheduler scheduler;
private volatile SelectorManager selectorManager;
private volatile SslContextFactory sslContextFactory;
@ -131,7 +131,7 @@ public class HttpClient extends AggregateLifeCycle
addBean(byteBufferPool);
if (scheduler == null)
scheduler = Executors.newSingleThreadScheduledExecutor();
scheduler = new TimerScheduler();
addBean(scheduler);
selectorManager = newSelectorManager();

4
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
View File

@ -47,7 +47,7 @@ public class ChannelEndPoint extends AbstractEndPoint
private volatile boolean _ishut;
private volatile boolean _oshut;
public ChannelEndPoint(Scheduler scheduler,SocketChannel channel) throws IOException
public ChannelEndPoint(Scheduler scheduler,SocketChannel channel)
{
super(scheduler,
(InetSocketAddress)channel.socket().getLocalSocketAddress(),
@ -186,7 +186,7 @@ public class ChannelEndPoint extends AbstractEndPoint
if (flushed>0)
{
notIdle();
// clear empty buffers to prevent position creeping up the buffer
for (ByteBuffer b : buffers)
if (BufferUtil.isEmpty(b))

3
jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
View File

@ -18,7 +18,6 @@
package org.eclipse.jetty.io;
import java.io.IOException;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
@ -75,7 +74,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa
*/
private volatile int _interestOps;
public SelectChannelEndPoint(SocketChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler, long idleTimeout) throws IOException
public SelectChannelEndPoint(SocketChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler, long idleTimeout)
{
super(scheduler,channel);
_selector = selector;