andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed potential concurrency issues

Browse Source 
* message queue should be final
This commit is contained in:
Trustin Lee 2009-06-25 10:10:55 +00:00
parent 1cff6738be
commit 147173e56d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java
View File

@ -27,6 +27,7 @@ import static org.jboss.netty.channel.Channels.*;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.URI;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@ -77,20 +78,20 @@ class HttpTunnelingClientSocketChannel extends AbstractChannel
volatile Thread workerThread;
String sessionId;
volatile String sessionId;
boolean closed = false;
volatile boolean closed = false;
LinkedTransferQueue<byte[]> messages = new LinkedTransferQueue<byte[]>();
final BlockingQueue<byte[]> messages = new LinkedTransferQueue<byte[]>();
private final ClientSocketChannelFactory clientSocketChannelFactory;
SocketChannel channel;
volatile SocketChannel channel;
private final DelimiterBasedFrameDecoder decoder = new DelimiterBasedFrameDecoder(8092, ChannelBuffers.wrappedBuffer(new byte[] { '\r', '\n' }));
private final HttpTunnelingClientSocketChannel.ServletChannelHandler handler = new ServletChannelHandler();
private HttpTunnelAddress remoteAddress;
volatile HttpTunnelAddress remoteAddress;
HttpTunnelingClientSocketChannel(
ChannelFactory factory,
@ -255,8 +256,9 @@ class HttpTunnelingClientSocketChannel extends AbstractChannel
ChannelStateEvent e) throws Exception {
SSLContext sslContext = getConfig().getSslContext();
if (sslContext != null) {
// FIXME: specify peer host and port.
SSLEngine engine = sslContext.createSSLEngine();
URI uri = remoteAddress.getUri();
SSLEngine engine = sslContext.createSSLEngine(
uri.getHost(), uri.getPort());
engine.setUseClientMode(true);
SocketChannel ch = (SocketChannel) e.getChannel();