tag:n2.nabble.com,2006:forum-685716 2009-06-30T04:36:01Z Commit logs are archived here. tag:n2.nabble.com,2006:post-3181813 2009-06-30T04:36:01Z 2009-06-30T04:36:01Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 07:36:01 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1521 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>Indentation <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:22:26 UTC (rev 1520) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:36:01 UTC (rev 1521) <br>@@ -119,18 +119,22 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getLocalAddress() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: NPE - Cache to avoid <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return channel.getLocalAddress(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: NPE - Cache to avoid <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return channel.getRemoteAddress(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: Should not return false during reconnection. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return channel.isBound(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isConnected() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: Should not return false during reconnection. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return channel.isConnected(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; <br>@@ -188,91 +192,91 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress connectAddress = new InetSocketAddress(url.getHost(), url.getPort()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.connect(connectAddress).addListener( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;new ChannelFutureListener() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture f) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure SSL <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture sslHandshakeFuture = null; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: bindAddress not respected. <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.connect(connectAddress).addListener(new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture f) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure SSL <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture sslHandshakeFuture = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandshakeFuture = sslHandler.handshake(channel); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (SSLException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, e); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandshakeFuture = sslHandler.handshake(channel); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (SSLException e) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(e); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, e); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the HTTP request. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final HttpRequest req = new DefaultHttpRequest( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpVersion.HTTP_1_1, HttpMethod.POST, url.getRawPath()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.HOST, url.getHost()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TYPE, &quot;application/octet-stream&quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TRANSFER_ENCODING, HttpHeaders.Values.BINARY); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;CookieEncoder ce = new CookieEncoder(false); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ce.addCookie(JSESSIONID, sessionId); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String cookie = ce.encode(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;//System.out.println(&quot;COOKIE: &quot; + cookie); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.COOKIE, cookie); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the HTTP request. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final HttpRequest req = new DefaultHttpRequest( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpVersion.HTTP_1_1, HttpMethod.POST, url.getRawPath()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.HOST, url.getHost()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TYPE, &quot;application/octet-stream&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TRANSFER_ENCODING, HttpHeaders.Values.BINARY); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;CookieEncoder ce = new CookieEncoder(false); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ce.addCookie(JSESSIONID, sessionId); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String cookie = ce.encode(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;//System.out.println(&quot;COOKIE: &quot; + cookie); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.COOKIE, cookie); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslHandshakeFuture == null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!channel.isBound()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(HttpTunnelingClientSocketChannel.this, channel.getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslHandshakeFuture == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!channel.isBound()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(HttpTunnelingClientSocketChannel.this, channel.getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(HttpTunnelingClientSocketChannel.this, channel.getRemoteAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandshakeFuture.addListener(new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture f) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!isBound()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: channelBound is not fired - needs own state flag <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(HttpTunnelingClientSocketChannel.this, channel.getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(HttpTunnelingClientSocketChannel.this, channel.getRemoteAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(HttpTunnelingClientSocketChannel.this, f.getCause()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(HttpTunnelingClientSocketChannel.this, channel.getRemoteAddress()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandshakeFuture.addListener(new ChannelFutureListener() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture f) <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!isBound()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: channelBound is not fired. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(HttpTunnelingClientSocketChannel.this, channel.getLocalAddress()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(HttpTunnelingClientSocketChannel.this, channel.getRemoteAddress()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(HttpTunnelingClientSocketChannel.this, f.getCause()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;}); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, f.getCause()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;}); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;}); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;}); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private void createSocketChannel() { <br>@@ -285,6 +289,7 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;void sendChunk(ChannelBuffer a, final ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Investigate race condition during reconnection <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final int size = a.readableBytes(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(new DefaultHttpChunk(a)).addListener(new ChannelFutureListener() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture f) <br>@@ -303,6 +308,7 @@ <br>&nbsp; &nbsp; &nbsp;void closeSocket() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (setClosed()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the end of chunk. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Investigate race condition during reconnection <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;synchronized (writeLock) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(HttpChunk.LAST_CHUNK).addListener(ChannelFutureListener.CLOSE); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181813&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181645 2009-06-30T04:22:27Z 2009-06-30T04:22:27Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 07:22:26 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1520 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>Fixed a problem where HttpTunnelingClientSocketChannel.setInterestOps() returns a wrong future <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:19:27 UTC (rev 1519) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:22:26 UTC (rev 1520) <br>@@ -146,8 +146,20 @@ <br>&nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp;public ChannelFuture setInterestOps(int interestOps) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;// TODO: Wrap the future. <br>- &nbsp; &nbsp; &nbsp; &nbsp;return channel.setInterestOps(interestOps); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;final ChannelFuture future = future(this); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.setInterestOps(interestOps).addListener(new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture f) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelInterestChanged(HttpTunnelingClientSocketChannel.this); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(HttpTunnelingClientSocketChannel.this, f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;}); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return future; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;@Override <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181645&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181611 2009-06-30T04:19:27Z 2009-06-30T04:19:27Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 07:19:27 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1519 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java <br>Log: <br>Removed a resolved issue marker <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java 2009-06-30 11:16:45 UTC (rev 1518) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java 2009-06-30 11:19:27 UTC (rev 1519) <br>@@ -127,11 +127,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Close the outbound connection. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;invalidateHttpSession(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;e.getChannel().close(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: What happens if the client connects to <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the server at this point with the old session ID? <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;We have to make sure no new session is created, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;perhaps by keeping an LRU cache of the destroyed <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;session IDs. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} finally { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reconnectLock.unlock(); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181611&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181583 2009-06-30T04:16:45Z 2009-06-30T04:16:45Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 07:16:45 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1518 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>No more awaitUninterruptible <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:16:01 UTC (rev 1517) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:16:45 UTC (rev 1518) <br>@@ -292,11 +292,9 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (setClosed()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the end of chunk. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;synchronized (writeLock) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(HttpChunk.LAST_CHUNK).awaitUninterruptibly(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(HttpChunk.LAST_CHUNK).addListener(ChannelFutureListener.CLOSE); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;closed = true; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.close(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181583&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181573 2009-06-30T04:16:01Z 2009-06-30T04:16:01Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 07:16:01 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1517 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java <br>Log: <br>Fixed bugs caused by today's refactoring <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 10:30:48 UTC (rev 1516) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 11:16:01 UTC (rev 1517) <br>@@ -36,6 +36,7 @@ <br>&nbsp;import org.jboss.netty.channel.AbstractChannel; <br>&nbsp;import org.jboss.netty.channel.ChannelFactory; <br>&nbsp;import org.jboss.netty.channel.ChannelFuture; <br>+import org.jboss.netty.channel.ChannelFutureListener; <br>&nbsp;import org.jboss.netty.channel.ChannelHandlerContext; <br>&nbsp;import org.jboss.netty.channel.ChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ChannelPipelineCoverage; <br>@@ -164,56 +165,102 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;void connectAndSendHeaders(boolean reconnect, HttpTunnelAddress remoteAddress) throws SSLException { <br>+ &nbsp; &nbsp;void connectAndSendHeaders(boolean reconnect, final HttpTunnelAddress remoteAddress, final ChannelFuture future) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress; <br>- &nbsp; &nbsp; &nbsp; &nbsp;URI url = remoteAddress.getUri(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;final URI url = remoteAddress.getUri(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (reconnect) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;closeSocket(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;createSocketChannel(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress connectAddress = new InetSocketAddress(url.getHost(), url.getPort()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.connect(connectAddress).awaitUninterruptibly(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.connect(connectAddress).addListener( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture f) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure SSL <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture sslHandshakeFuture = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;// Configure SSL <br>- &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandshakeFuture = sslHandler.handshake(channel); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (SSLException e) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(e); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, e); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandler.handshake(channel).awaitUninterruptibly(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the HTTP request. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final HttpRequest req = new DefaultHttpRequest( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpVersion.HTTP_1_1, HttpMethod.POST, url.getRawPath()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.HOST, url.getHost()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TYPE, &quot;application/octet-stream&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TRANSFER_ENCODING, HttpHeaders.Values.BINARY); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;CookieEncoder ce = new CookieEncoder(false); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ce.addCookie(JSESSIONID, sessionId); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String cookie = ce.encode(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;//System.out.println(&quot;COOKIE: &quot; + cookie); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.COOKIE, cookie); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;// Send the HTTP request. <br>- &nbsp; &nbsp; &nbsp; &nbsp;HttpRequest req = new DefaultHttpRequest( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpVersion.HTTP_1_1, HttpMethod.POST, url.getRawPath()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.HOST, url.getHost()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TYPE, &quot;application/octet-stream&quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED); <br>- &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TRANSFER_ENCODING, HttpHeaders.Values.BINARY); <br>- &nbsp; &nbsp; &nbsp; &nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;CookieEncoder ce = new CookieEncoder(false); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ce.addCookie(JSESSIONID, sessionId); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.COOKIE, ce.encode()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslHandshakeFuture == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!channel.isBound()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(HttpTunnelingClientSocketChannel.this, channel.getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(HttpTunnelingClientSocketChannel.this, channel.getRemoteAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandshakeFuture.addListener(new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture f) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!isBound()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: channelBound is not fired. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(HttpTunnelingClientSocketChannel.this, channel.getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(HttpTunnelingClientSocketChannel.this, channel.getRemoteAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(HttpTunnelingClientSocketChannel.this, f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;}); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;}); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private void createSocketChannel() { <br>@@ -225,15 +272,20 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel = clientSocketChannelFactory.newChannel(channelPipeline); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;int sendChunk(ChannelBuffer a) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;int size = a.readableBytes(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;String hex = Integer.toHexString(size) + HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR; <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;synchronized (writeLock) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(new DefaultHttpChunk(a)).awaitUninterruptibly(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;return size + hex.length() + HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR.length(); <br>+ &nbsp; &nbsp;void sendChunk(ChannelBuffer a, final ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;final int size = a.readableBytes(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.write(new DefaultHttpChunk(a)).addListener(new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture f) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (f.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireWriteComplete(HttpTunnelingClientSocketChannel.this, size); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(HttpTunnelingClientSocketChannel.this, f.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;}); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;void closeSocket() { <br>@@ -256,7 +308,6 @@ <br>&nbsp; &nbsp; &nbsp;class ServletChannelHandler extends SimpleChannelUpstreamHandler { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;private volatile boolean readingChunks; <br>- &nbsp; &nbsp; &nbsp; &nbsp;int nextChunkSize = -1; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { <br>@@ -268,14 +319,20 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;newSessionId = getSessionId(res, HttpHeaders.Names.SET_COOKIE2); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;//System.out.println(&quot;NEW_SESSION_ID: &quot; + newSessionId); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Utilize keep-alive if possible to reduce reconnection overhead. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Consider non-200 status code. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;If the status code is not 200, no more reconnection attempt <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;should be made. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: If the session ID in the response is different from <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session ID specified in the request, then it means <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session has timed out. &nbsp;If so, channel must be closed. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// If the session ID has been changed, it means the session has <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// been timed out and a new session has been created. &nbsp;If so, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// channel must be closed. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null && !sessionId.equals(newSessionId)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;closeSocket(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sessionId = newSessionId; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (res.isChunked()) { <br>@@ -283,13 +340,13 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer content = res.getContent(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (content.readable()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(channel, content); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(HttpTunnelingClientSocketChannel.this, content); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpChunk chunk = (HttpChunk) e.getMessage(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!chunk.isLast()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(channel, chunk.getContent()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(HttpTunnelingClientSocketChannel.this, chunk.getContent()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;readingChunks = false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java 2009-06-30 10:30:48 UTC (rev 1516) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java 2009-06-30 11:16:01 UTC (rev 1517) <br>@@ -73,7 +73,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;case CONNECTED: <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (value != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;connect(channel, future, (HttpTunnelAddress) value); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.connectAndSendHeaders(false, ((HttpTunnelAddress) value), future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;close(channel, future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>@@ -94,22 +94,10 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (e instanceof MessageEvent) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;write(channel, (ChannelBuffer) ((MessageEvent) e).getMessage(), future); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.sendChunk(((ChannelBuffer) ((MessageEvent) e).getMessage()), future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;private void write(HttpTunnelingClientSocketChannel channel, ChannelBuffer msg, ChannelFuture future) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int writtenBytes = channel.sendChunk(msg); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireWriteComplete(channel, writtenBytes); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp;} <br>- <br>&nbsp; &nbsp; &nbsp;private void bind( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress localAddress) { <br>@@ -123,30 +111,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;private void connect( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelAddress remoteAddress) { <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean bound = channel.isBound(); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.connectAndSendHeaders(false, remoteAddress); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Fire events. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!bound) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(channel, channel.getLocalAddress()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(channel, channel.getRemoteAddress()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} finally { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: Rewrite exception handling. <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp;} <br>- &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp;private void close( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;boolean connected = channel.isConnected(); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181573&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181252 2009-06-30T03:30:49Z 2009-06-30T03:30:49Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 06:30:48 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1516 <br><br>Removed: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java <br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannelFactory.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/example/http/tunnel/HttpTunnelingClientExample.java <br>Log: <br>Eliminated unnecessary use of thread pool in the HTTP tunneling transport <br><br>Deleted: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java 2009-06-30 10:03:41 UTC (rev 1515) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java 2009-06-30 10:30:48 UTC (rev 1516) <br>@@ -1,175 +0,0 @@ <br>-/* <br>- * JBoss, Home of Professional Open Source <br>- * <br>- * Copyright 2008, Red Hat Middleware LLC, and individual contributors <br>- * by the @author tags. See the COPYRIGHT.txt in the distribution for a <br>- * full listing of individual contributors. <br>- * <br>- * This is free software; you can redistribute it and/or modify it <br>- * under the terms of the GNU Lesser General Public License as <br>- * published by the Free Software Foundation; either version 2.1 of <br>- * the License, or (at your option) any later version. <br>- * <br>- * This software is distributed in the hope that it will be useful, <br>- * but WITHOUT ANY WARRANTY; without even the implied warranty of <br>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU <br>- * Lesser General Public License for more details. <br>- * <br>- * You should have received a copy of the GNU Lesser General Public <br>- * License along with this software; if not, write to the Free <br>- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA <br>- * 02110-1301 USA, or see the FSF site: <a href="http://www.fsf.org" target="_top" rel="nofollow">http://www.fsf.org</a>. <br>- */ <br>-package org.jboss.netty.channel.socket.http; <br>- <br>-import static org.jboss.netty.channel.Channels.*; <br>- <br>-import org.jboss.netty.buffer.ChannelBuffer; <br>-import org.jboss.netty.channel.Channel; <br>-import org.jboss.netty.channel.ChannelFuture; <br>- <br>-/** <br>- * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181252&i=0" target="_top" rel="nofollow">netty-dev@...</a>) <br>- * @author Andy Taylor (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181252&i=1" target="_top" rel="nofollow">andy.taylor@...</a>) <br>- * @author Trustin Lee (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181252&i=2" target="_top" rel="nofollow">tlee@...</a>) <br>- * @version $Rev$, $Date$ <br>- */ <br>-final class HttpTunnelWorker implements Runnable { <br>- <br>- &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel channel; <br>- <br>- &nbsp; &nbsp;HttpTunnelWorker(HttpTunnelingClientSocketChannel channel) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.channel = channel; <br>- &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp;public void run() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.workerThread = Thread.currentThread(); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;while (channel.isOpen()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;synchronized (channel.interestOpsLock) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;while (!channel.isReadable()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// notify() is not called at all. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// close() and setInterestOps() calls Thread.interrupt() <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.interestOpsLock.wait(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;catch (InterruptedException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!channel.isOpen()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf = channel.receiveChunk(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!channel.isOpen()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (buf != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(channel, buf); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;// Setting the workerThread to null will prevent any channel <br>- &nbsp; &nbsp; &nbsp; &nbsp;// operations from interrupting this thread from now on. <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.workerThread = null; <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;// Clean up. <br>- &nbsp; &nbsp; &nbsp; &nbsp;close(channel, succeededFuture(channel)); <br>- &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp;static void write( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Object message) { <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf = (ChannelBuffer) message; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int writtenBytes = channel.sendChunk(buf); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireWriteComplete(channel, writtenBytes); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp;static void setInterestOps( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future, int interestOps) { <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;// Override OP_WRITE flag - a user cannot change this flag. <br>- &nbsp; &nbsp; &nbsp; &nbsp;interestOps &= ~Channel.OP_WRITE; <br>- &nbsp; &nbsp; &nbsp; &nbsp;interestOps |= channel.getInterestOps() & Channel.OP_WRITE; <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean changed = false; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (channel.getInterestOps() != interestOps) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if ((interestOps & Channel.OP_READ) != 0) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.setInterestOpsNow(Channel.OP_READ); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.setInterestOpsNow(Channel.OP_NONE); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;changed = true; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (changed) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;synchronized (channel.interestOpsLock) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.setInterestOpsNow(interestOps); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Notify the worker so it stops or continues reading. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Thread currentThread = Thread.currentThread(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Thread workerThread = channel.workerThread; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (workerThread != null && currentThread != workerThread) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;workerThread.interrupt(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelInterestChanged(channel); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp;static void close(HttpTunnelingClientSocketChannel channel, ChannelFuture future) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean connected = channel.isConnected(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean bound = channel.isBound(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.closeSocket(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (channel.setClosed()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (connected) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Notify the worker so it stops reading. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Thread currentThread = Thread.currentThread(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Thread workerThread = channel.workerThread; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (workerThread != null && currentThread != workerThread) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;workerThread.interrupt(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelDisconnected(channel); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (bound) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelUnbound(channel); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelClosed(channel); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp;} <br>- <br>-} <br>\ No newline at end of file <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 10:03:41 UTC (rev 1515) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 10:30:48 UTC (rev 1516) <br>@@ -27,9 +27,6 @@ <br>&nbsp;import java.net.InetSocketAddress; <br>&nbsp;import java.net.SocketAddress; <br>&nbsp;import java.net.URI; <br>-import java.util.concurrent.BlockingQueue; <br>-import java.util.concurrent.locks.Lock; <br>-import java.util.concurrent.locks.ReentrantLock; <br>&nbsp; <br>&nbsp;import javax.net.ssl.SSLContext; <br>&nbsp;import javax.net.ssl.SSLEngine; <br>@@ -43,6 +40,7 @@ <br>&nbsp;import org.jboss.netty.channel.ChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ChannelPipelineCoverage; <br>&nbsp;import org.jboss.netty.channel.ChannelSink; <br>+import org.jboss.netty.channel.ChannelStateEvent; <br>&nbsp;import org.jboss.netty.channel.DefaultChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ExceptionEvent; <br>&nbsp;import org.jboss.netty.channel.MessageEvent; <br>@@ -65,7 +63,6 @@ <br>&nbsp;import org.jboss.netty.handler.ssl.SslHandler; <br>&nbsp;import org.jboss.netty.logging.InternalLogger; <br>&nbsp;import org.jboss.netty.logging.InternalLoggerFactory; <br>-import org.jboss.netty.util.internal.LinkedTransferQueue; <br>&nbsp; <br>&nbsp;/** <br>&nbsp; * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181252&i=3" target="_top" rel="nofollow">netty-dev@...</a>) <br>@@ -82,7 +79,6 @@ <br>&nbsp; &nbsp; &nbsp;private static final String JSESSIONID = &quot;JSESSIONID&quot;; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final HttpTunnelingSocketChannelConfig config; <br>- &nbsp; &nbsp;private final Lock reconnectLock = new ReentrantLock(); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile boolean awaitingInitialResponse = true; <br>&nbsp; <br>@@ -95,8 +91,6 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile boolean closed = false; <br>&nbsp; <br>- &nbsp; &nbsp;final BlockingQueue&lt;ChannelBuffer&gt; messages = new LinkedTransferQueue&lt;ChannelBuffer&gt;(); <br>- <br>&nbsp; &nbsp; &nbsp;private final ClientSocketChannelFactory clientSocketChannelFactory; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile SocketChannel channel; <br>@@ -138,6 +132,22 @@ <br>&nbsp; &nbsp; &nbsp;public boolean isConnected() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return channel.isConnected(); <br>&nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; <br>+ &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp;public int getInterestOps() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.getInterestOps(); <br>+ &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; <br>+ &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp;public boolean isWritable() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.isWritable(); <br>+ &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; <br>+ &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp;public ChannelFuture setInterestOps(int interestOps) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// TODO: Wrap the future. <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.setInterestOps(interestOps); <br>+ &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp;protected boolean setClosed() { <br>@@ -145,11 +155,6 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;@Override <br>- &nbsp; &nbsp;protected void setInterestOpsNow(int interestOps) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;super.setInterestOpsNow(interestOps); <br>- &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp;public ChannelFuture write(Object message, SocketAddress remoteAddress) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress == null || remoteAddress.equals(getRemoteAddress())) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return super.write(message, null); <br>@@ -231,38 +236,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return size + hex.length() + HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR.length(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;ChannelBuffer receiveChunk() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf = null; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf = messages.take(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (InterruptedException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Ignore <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;return buf; <br>- &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp;void reconnect() throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (closed) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalStateException(&quot;channel closed&quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;// XXX: What if a user writes something during the connection attempt? <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (reconnectLock.tryLock()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;awaitingInitialResponse = true; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;connectAndSendHeaders(true, remoteAddress); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} finally { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reconnectLock.unlock(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reconnectLock.lock(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} finally { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reconnectLock.unlock(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp;} <br>- <br>&nbsp; &nbsp; &nbsp;void closeSocket() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (setClosed()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the end of chunk. <br>@@ -295,10 +268,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;newSessionId = getSessionId(res, HttpHeaders.Names.SET_COOKIE2); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (newSessionId == null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Server does not support JSESSIONID? <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Utilize keep-alive if possible to reduce reconnection overhead. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Consider non-200 status code. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;If the status code is not 200, no more reconnection attempt <br>@@ -314,15 +283,13 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer content = res.getContent(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (content.readable()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;System.out.println(&quot;1: &quot; + content.toString(&quot;ISO-8859-1&quot;)); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;messages.offer(content); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(channel, content); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpChunk chunk = (HttpChunk) e.getMessage(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!chunk.isLast()) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;System.out.println(&quot;2: &quot; + chunk.getContent()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;messages.offer(chunk.getContent()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(channel, chunk.getContent()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;readingChunks = false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>@@ -331,6 +298,19 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// TODO Reconnect. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// sessionId is null if: <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// 1) A user closed the channel explicitly, or <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// 2) The server does not support JSESSIONID. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.close(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel.this, <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannelFactory.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannelFactory.java 2009-06-30 10:03:41 UTC (rev 1515) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannelFactory.java 2009-06-30 10:30:48 UTC (rev 1516) <br>@@ -22,13 +22,10 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.http; <br>&nbsp; <br>-import java.util.concurrent.Executor; <br>- <br>&nbsp;import org.jboss.netty.channel.ChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ChannelSink; <br>&nbsp;import org.jboss.netty.channel.socket.ClientSocketChannelFactory; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannel; <br>-import org.jboss.netty.util.internal.ExecutorUtil; <br>&nbsp; <br>&nbsp;/** <br>&nbsp; * Creates a client-side {@link SocketChannel} which connects to an <br>@@ -42,47 +39,21 @@ <br>&nbsp; */ <br>&nbsp;public class HttpTunnelingClientSocketChannelFactory implements ClientSocketChannelFactory { <br>&nbsp; <br>- &nbsp; &nbsp;private final Executor workerExecutor; <br>- &nbsp; &nbsp;private final ChannelSink sink; <br>- &nbsp; &nbsp;ClientSocketChannelFactory clientSocketChannelFactory; <br>+ &nbsp; &nbsp;private final ChannelSink sink = new HttpTunnelingClientSocketPipelineSink(); <br>+ &nbsp; &nbsp;private final ClientSocketChannelFactory clientSocketChannelFactory; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * <br>- &nbsp; &nbsp; * @param workerExecutor <br>+ &nbsp; &nbsp; * Creates a new instance. <br>&nbsp; &nbsp; &nbsp; */ <br>- &nbsp; &nbsp;public HttpTunnelingClientSocketChannelFactory(ClientSocketChannelFactory clientSocketChannelFactory, Executor workerExecutor) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this(workerExecutor, Runtime.getRuntime().availableProcessors()); <br>+ &nbsp; &nbsp;public HttpTunnelingClientSocketChannelFactory(ClientSocketChannelFactory clientSocketChannelFactory) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.clientSocketChannelFactory = clientSocketChannelFactory; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * Creates a new instance. <br>- &nbsp; &nbsp; * <br>- &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp;the {@link java.util.concurrent.Executor} which will execute the boss thread <br>- &nbsp; &nbsp; * @param workerExecutor <br>- &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp;the {@link java.util.concurrent.Executor} which will execute the I/O worker threads <br>- &nbsp; &nbsp; * @param workerCount <br>- &nbsp; &nbsp; */ <br>- &nbsp; &nbsp;public HttpTunnelingClientSocketChannelFactory(Executor workerExecutor, int workerCount) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (workerExecutor == null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new NullPointerException(&quot;workerExecutor&quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (workerCount &lt;= 0) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalArgumentException( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;workerCount (&quot; + workerCount + &quot;) &quot; + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;must be a positive integer.&quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.workerExecutor = workerExecutor; <br>- &nbsp; &nbsp; &nbsp; &nbsp;sink = new HttpTunnelingClientSocketPipelineSink(workerExecutor); <br>- &nbsp; &nbsp;} <br>- <br>&nbsp; &nbsp; &nbsp;public SocketChannel newChannel(ChannelPipeline pipeline) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return new HttpTunnelingClientSocketChannel(this, pipeline, sink, clientSocketChannelFactory); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void releaseExternalResources() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;clientSocketChannelFactory.releaseExternalResources(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;ExecutorUtil.terminate(workerExecutor); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp;} <br>\ No newline at end of file <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java 2009-06-30 10:03:41 UTC (rev 1515) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java 2009-06-30 10:30:48 UTC (rev 1516) <br>@@ -25,8 +25,8 @@ <br>&nbsp;import static org.jboss.netty.channel.Channels.*; <br>&nbsp; <br>&nbsp;import java.net.SocketAddress; <br>-import java.util.concurrent.Executor; <br>&nbsp; <br>+import org.jboss.netty.buffer.ChannelBuffer; <br>&nbsp;import org.jboss.netty.channel.AbstractChannelSink; <br>&nbsp;import org.jboss.netty.channel.ChannelEvent; <br>&nbsp;import org.jboss.netty.channel.ChannelFuture; <br>@@ -35,8 +35,6 @@ <br>&nbsp;import org.jboss.netty.channel.ChannelState; <br>&nbsp;import org.jboss.netty.channel.ChannelStateEvent; <br>&nbsp;import org.jboss.netty.channel.MessageEvent; <br>-import org.jboss.netty.util.ThreadRenamingRunnable; <br>-import org.jboss.netty.util.internal.IoWorkerRunnable; <br>&nbsp; <br>&nbsp;/** <br>&nbsp; * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181252&i=4" target="_top" rel="nofollow">netty-dev@...</a>) <br>@@ -47,10 +45,9 @@ <br>&nbsp;final class HttpTunnelingClientSocketPipelineSink extends AbstractChannelSink { <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;static final String LINE_TERMINATOR = &quot;\r\n&quot;; <br>- &nbsp; &nbsp;private final Executor workerExecutor; <br>&nbsp; <br>- &nbsp; &nbsp;HttpTunnelingClientSocketPipelineSink(Executor workerExecutor) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.workerExecutor = workerExecutor; <br>+ &nbsp; &nbsp;HttpTunnelingClientSocketPipelineSink() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;super(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void eventSunk( <br>@@ -64,34 +61,55 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;switch (state) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;case OPEN: <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (Boolean.FALSE.equals(value)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelWorker.close(channel, future); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;close(channel, future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;case BOUND: <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (value != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;bind(channel, future, (SocketAddress) value); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelWorker.close(channel, future); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;close(channel, future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;case CONNECTED: <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (value != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;connect(channel, future, (HttpTunnelAddress) value); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelWorker.close(channel, future); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;close(channel, future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;case INTEREST_OPS: <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelWorker.setInterestOps(channel, future, ((Integer) value).intValue()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final ChannelFuture actualFuture = future; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setInterestOps(channel.channel, ((Integer) value).intValue()).addListener( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;new ChannelFutureListener() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void operationComplete(ChannelFuture future) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (future.isSuccess()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;actualFuture.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;actualFuture.setFailure(future.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;}); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (e instanceof MessageEvent) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelWorker.write( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel, future, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;((MessageEvent) e).getMessage()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;write(channel, (ChannelBuffer) ((MessageEvent) e).getMessage(), future); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;private void write(HttpTunnelingClientSocketChannel channel, ChannelBuffer msg, ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int writtenBytes = channel.sendChunk(msg); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireWriteComplete(channel, writtenBytes); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp;private void bind( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress localAddress) { <br>@@ -110,8 +128,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelAddress remoteAddress) { <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;boolean bound = channel.isBound(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean connected = false; <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean workerStarted = false; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); <br>&nbsp; <br>@@ -123,25 +139,36 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelBound(channel, channel.getLocalAddress()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelConnected(channel, channel.getRemoteAddress()); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Start the business. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;workerExecutor.execute( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;new IoWorkerRunnable( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;new ThreadRenamingRunnable( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;new HttpTunnelWorker(channel), <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;HTTP Tunnel I/O client worker (channelId: &quot; + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getId() + &quot;, &quot; + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getLocalAddress() + &quot; =&gt; &quot; + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getRemoteAddress() + ')'))); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;workerStarted = true; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} finally { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (connected && !workerStarted) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelWorker.close(channel, future); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: Rewrite exception handling. <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; <br>+ &nbsp; &nbsp;private void close( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel channel, ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;boolean connected = channel.isConnected(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;boolean bound = channel.isBound(); &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.closeSocket(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (channel.setClosed()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (connected) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelDisconnected(channel); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (bound) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelUnbound(channel); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelClosed(channel); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setSuccess(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(t); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, t); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>- <br>&nbsp;} <br><br>Modified: trunk/src/main/java/org/jboss/netty/example/http/tunnel/HttpTunnelingClientExample.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/example/http/tunnel/HttpTunnelingClientExample.java 2009-06-30 10:03:41 UTC (rev 1515) <br>+++ trunk/src/main/java/org/jboss/netty/example/http/tunnel/HttpTunnelingClientExample.java 2009-06-30 10:30:48 UTC (rev 1516) <br>@@ -113,7 +113,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;System.err.println(&quot;Only HTTP is supported.&quot;); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannelFactory factory = new HttpTunnelingClientSocketChannelFactory(new OioClientSocketChannelFactory(Executors.newCachedThreadPool()), Executors.newCachedThreadPool()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannelFactory factory = new HttpTunnelingClientSocketChannelFactory(new OioClientSocketChannelFactory(Executors.newCachedThreadPool())); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ClientBootstrap bootstrap = new ClientBootstrap(factory); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;bootstrap.getPipeline().addLast(&quot;decoder&quot;, new StringDecoder()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;bootstrap.getPipeline().addLast(&quot;encoder&quot;, new StringEncoder()); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181252&i=5" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3180944 2009-06-30T03:03:41Z 2009-06-30T03:03:41Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 06:03:41 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1515 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>Used org.jboss.netty.handler.codec.http instead of custom decoder for maximum compatibility <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java 2009-06-30 09:52:47 UTC (rev 1514) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelWorker.java 2009-06-30 10:03:41 UTC (rev 1515) <br>@@ -25,7 +25,6 @@ <br>&nbsp;import static org.jboss.netty.channel.Channels.*; <br>&nbsp; <br>&nbsp;import org.jboss.netty.buffer.ChannelBuffer; <br>-import org.jboss.netty.buffer.ChannelBuffers; <br>&nbsp;import org.jboss.netty.channel.Channel; <br>&nbsp;import org.jboss.netty.channel.ChannelFuture; <br>&nbsp; <br>@@ -62,7 +61,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byte[] buf; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf = channel.receiveChunk(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>@@ -74,11 +73,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (buf != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffers.wrappedBuffer( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getConfig().getBufferFactory().getDefaultOrder(), <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireMessageReceived(channel, buf); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 09:52:47 UTC (rev 1514) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 10:03:41 UTC (rev 1515) <br>@@ -22,8 +22,7 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.http; <br>&nbsp; <br>-import static org.jboss.netty.channel.Channels.fireChannelOpen; <br>-import static org.jboss.netty.channel.Channels.fireExceptionCaught; <br>+import static org.jboss.netty.channel.Channels.*; <br>&nbsp; <br>&nbsp;import java.net.InetSocketAddress; <br>&nbsp;import java.net.SocketAddress; <br>@@ -37,7 +36,6 @@ <br>&nbsp;import javax.net.ssl.SSLException; <br>&nbsp; <br>&nbsp;import org.jboss.netty.buffer.ChannelBuffer; <br>-import org.jboss.netty.buffer.ChannelBuffers; <br>&nbsp;import org.jboss.netty.channel.AbstractChannel; <br>&nbsp;import org.jboss.netty.channel.ChannelFactory; <br>&nbsp;import org.jboss.netty.channel.ChannelFuture; <br>@@ -51,7 +49,19 @@ <br>&nbsp;import org.jboss.netty.channel.SimpleChannelUpstreamHandler; <br>&nbsp;import org.jboss.netty.channel.socket.ClientSocketChannelFactory; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannel; <br>-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; <br>+import org.jboss.netty.handler.codec.http.Cookie; <br>+import org.jboss.netty.handler.codec.http.CookieDecoder; <br>+import org.jboss.netty.handler.codec.http.CookieEncoder; <br>+import org.jboss.netty.handler.codec.http.DefaultHttpChunk; <br>+import org.jboss.netty.handler.codec.http.DefaultHttpRequest; <br>+import org.jboss.netty.handler.codec.http.HttpChunk; <br>+import org.jboss.netty.handler.codec.http.HttpHeaders; <br>+import org.jboss.netty.handler.codec.http.HttpMethod; <br>+import org.jboss.netty.handler.codec.http.HttpRequest; <br>+import org.jboss.netty.handler.codec.http.HttpRequestEncoder; <br>+import org.jboss.netty.handler.codec.http.HttpResponse; <br>+import org.jboss.netty.handler.codec.http.HttpResponseDecoder; <br>+import org.jboss.netty.handler.codec.http.HttpVersion; <br>&nbsp;import org.jboss.netty.handler.ssl.SslHandler; <br>&nbsp;import org.jboss.netty.logging.InternalLogger; <br>&nbsp;import org.jboss.netty.logging.InternalLoggerFactory; <br>@@ -68,6 +78,8 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;static final InternalLogger logger = <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;InternalLoggerFactory.getInstance(HttpTunnelingClientSocketChannel.class); <br>+ &nbsp; &nbsp; <br>+ &nbsp; &nbsp;private static final String JSESSIONID = &quot;JSESSIONID&quot;; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final HttpTunnelingSocketChannelConfig config; <br>&nbsp; &nbsp; &nbsp;private final Lock reconnectLock = new ReentrantLock(); <br>@@ -83,13 +95,12 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile boolean closed = false; <br>&nbsp; <br>- &nbsp; &nbsp;final BlockingQueue&lt;byte[]&gt; messages = new LinkedTransferQueue&lt;byte[]&gt;(); <br>+ &nbsp; &nbsp;final BlockingQueue&lt;ChannelBuffer&gt; messages = new LinkedTransferQueue&lt;ChannelBuffer&gt;(); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final ClientSocketChannelFactory clientSocketChannelFactory; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile SocketChannel channel; <br>&nbsp; <br>- &nbsp; &nbsp;private final DelimiterBasedFrameDecoder decoder = new DelimiterBasedFrameDecoder(8092, ChannelBuffers.wrappedBuffer(new byte[] { '\r', '\n' })); <br>&nbsp; &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel.ServletChannelHandler handler = new ServletChannelHandler(); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile HttpTunnelAddress remoteAddress; <br>@@ -184,26 +195,27 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the HTTP request. <br>- &nbsp; &nbsp; &nbsp; &nbsp;StringBuilder builder = new StringBuilder(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;builder.append(&quot;POST &quot;).append(url.getRawPath()).append(&quot; HTTP/1.1&quot;).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR). <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;append(&quot;Host: &quot;).append(url.getHost()).append(&quot;:&quot;).append(url.getPort()).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR). <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;append(&quot;Content-Type: application/octet-stream&quot;).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR).append(&quot;Transfer-Encoding: chunked&quot;). <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR).append(&quot;Content-Transfer-Encoding: Binary&quot;).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR).append(&quot;Connection: Keep-Alive&quot;). <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR); <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (reconnect) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;builder.append(&quot;Cookie: JSESSIONID=&quot;).append(sessionId).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;HttpRequest req = new DefaultHttpRequest( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpVersion.HTTP_1_1, HttpMethod.POST, url.getRawPath()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.HOST, url.getHost()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TYPE, &quot;application/octet-stream&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.TRANSFER_ENCODING, HttpHeaders.Values.CHUNKED); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.CONTENT_TRANSFER_ENCODING, HttpHeaders.Values.BINARY); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (sessionId != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;CookieEncoder ce = new CookieEncoder(false); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ce.addCookie(JSESSIONID, sessionId); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;req.setHeader(HttpHeaders.Names.COOKIE, ce.encode()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;builder.append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR); <br>- &nbsp; &nbsp; &nbsp; &nbsp;String msg = builder.toString(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.write(ChannelBuffers.copiedBuffer(msg, &quot;ASCII&quot;)); <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.write(req); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * <br>- &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;private void createSocketChannel() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;DefaultChannelPipeline channelPipeline = new DefaultChannelPipeline(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;decoder&quot;, decoder); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// TODO Expose the codec options via HttpTunnelingSocketChannelConfig <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;decoder&quot;, new HttpResponseDecoder()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;encoder&quot;, new HttpRequestEncoder()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;handler&quot;, handler); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel = clientSocketChannelFactory.newChannel(channelPipeline); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -213,18 +225,14 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String hex = Integer.toHexString(size) + HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;synchronized (writeLock) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future = channel.write(ChannelBuffers.wrappedBuffer( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffers.copiedBuffer(hex, &quot;ASCII&quot;), <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;a, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffers.copiedBuffer(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR, &quot;ASCII&quot;))); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.awaitUninterruptibly(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(new DefaultHttpChunk(a)).awaitUninterruptibly(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return size + hex.length() + HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR.length(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;byte[] receiveChunk() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;byte[] buf = null; <br>+ &nbsp; &nbsp;ChannelBuffer receiveChunk() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf = null; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf = messages.take(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>@@ -259,12 +267,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (setClosed()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Send the end of chunk. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;synchronized (writeLock) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future = channel.write(ChannelBuffers.copiedBuffer( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;0&quot; + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;ASCII&quot;)); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.awaitUninterruptibly(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(HttpChunk.LAST_CHUNK).awaitUninterruptibly(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;closed = true; <br>@@ -278,49 +281,52 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;@ChannelPipelineCoverage(&quot;one&quot;) <br>&nbsp; &nbsp; &nbsp;class ServletChannelHandler extends SimpleChannelUpstreamHandler { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;private volatile boolean readingChunks; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int nextChunkSize = -1; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf = (ChannelBuffer) e.getMessage(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byte[] bytes = new byte[buf.readableBytes()]; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.getBytes(0, bytes); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (awaitingInitialResponse) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: This is fragile - should use HTTP codec. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!readingChunks) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpResponse res = (HttpResponse) e.getMessage(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String newSessionId = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;newSessionId = getSessionId(res, HttpHeaders.Names.SET_COOKIE); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (newSessionId == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;newSessionId = getSessionId(res, HttpHeaders.Names.SET_COOKIE2); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (newSessionId == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Server does not support JSESSIONID? <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Utilize keep-alive if possible to reduce reconnection overhead. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Consider non-200 status code. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;If the status code is not 200, no more reconnection attempt <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;should be made. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String line = new String(bytes); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (line.contains(&quot;Set-Cookie&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Session ID length can be different between containers. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: If the session ID in the response is different from <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session ID specified in the request, then it means <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session has timed out. &nbsp;If so, channel must be closed. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int start = line.indexOf(&quot;JSESSIONID=&quot;) + 11; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int end = line.indexOf(&quot;;&quot;, start); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sessionId = line.substring(start, end); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;else if (line.equals(&quot;&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;awaitingInitialResponse = false; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if(nextChunkSize == -1) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String hex = new String(bytes); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextChunkSize = Integer.parseInt(hex, 16); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if(nextChunkSize == 0) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if(!closed) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextChunkSize = -1; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;awaitingInitialResponse = true; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reconnect(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: If the session ID in the response is different from <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session ID specified in the request, then it means <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session has timed out. &nbsp;If so, channel must be closed. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sessionId = newSessionId; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (res.isChunked()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;readingChunks = true; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer content = res.getContent(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (content.readable()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;System.out.println(&quot;1: &quot; + content.toString(&quot;ISO-8859-1&quot;)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;messages.offer(content); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;messages.put(bytes); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextChunkSize = -1; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpChunk chunk = (HttpChunk) e.getMessage(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!chunk.isLast()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;System.out.println(&quot;2: &quot; + chunk.getContent()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;messages.offer(chunk.getContent()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;readingChunks = false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>@@ -332,4 +338,20 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.close(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; <br>+ &nbsp; &nbsp;static String getSessionId(HttpResponse res, String headerName) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;CookieDecoder decoder = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;for (String v: res.getHeaders(headerName)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (decoder == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;decoder = new CookieDecoder(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (Cookie c: decoder.decode(v)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (c.getName().equals(JSESSIONID)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return c.getValue(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp;} <br>&nbsp;} <br>\ No newline at end of file <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3180944&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181088 2009-06-30T02:52:47Z 2009-06-30T02:52:47Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:52:47 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1514 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java <br>Log: <br>Traceable exception message <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java 2009-06-30 09:52:00 UTC (rev 1513) <br>+++ trunk/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java 2009-06-30 09:52:47 UTC (rev 1514) <br>@@ -435,8 +435,9 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (oldReaderIndex == cumulation.readerIndex() && oldState == state) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalStateException( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;decode() method must consume at least one byte &quot; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;+ &quot;if it returned a decoded message.&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;decode() method must consume at least one byte &quot; + <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;if it returned a decoded message (caused by: &quot; + <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;getClass() + &quot;)&quot;); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// A successful decode <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181088&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3180812 2009-06-30T02:52:00Z 2009-06-30T02:52:00Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:52:00 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1513 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java <br>Log: <br>Traceable exception message <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java 2009-06-30 09:42:34 UTC (rev 1512) <br>+++ trunk/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java 2009-06-30 09:52:00 UTC (rev 1513) <br>@@ -260,7 +260,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (oldReaderIndex == cumulation.readerIndex()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalStateException( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;decode() method must read at least one byte &quot; + <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;if it returned a frame.&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;if it returned a frame (caused by: &quot; + getClass() + &quot;)&quot;); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unfoldAndFireMessageReceived(context, remoteAddress, frame); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3180812&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3181058 2009-06-30T02:42:34Z 2009-06-30T02:42:34Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:42:34 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1512 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java <br>Log: <br>Added Set-Cookie2 to HttpHeaders.Names <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java 2009-06-30 09:39:07 UTC (rev 1511) <br>+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java 2009-06-30 09:42:34 UTC (rev 1512) <br>@@ -204,6 +204,10 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String SET_COOKIE = &quot;Set-Cookie&quot;; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;Set-Cookie2&quot;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public static final String SET_COOKIE2 = &quot;Set-Cookie2&quot;; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;TE&quot;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String TE = &quot;TE&quot;; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3181058&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3180690 2009-06-30T02:39:08Z 2009-06-30T02:39:08Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:39:07 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1511 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java <br>Log: <br>HttpMessage.getHeaders() never returns null for convenience <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java 2009-06-30 09:29:35 UTC (rev 1510) <br>+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java 2009-06-30 09:39:07 UTC (rev 1511) <br>@@ -23,6 +23,7 @@ <br>&nbsp;package org.jboss.netty.handler.codec.http; <br>&nbsp; <br>&nbsp;import java.util.ArrayList; <br>+import java.util.Collections; <br>&nbsp;import java.util.LinkedList; <br>&nbsp;import java.util.List; <br>&nbsp;import java.util.Map; <br>@@ -207,7 +208,12 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public List&lt;String&gt; getHeaders(final String name) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return headers.get(name); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;List&lt;String&gt; values = headers.get(name); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (values == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return Collections.emptyList(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return values; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean containsHeader(final String name) { <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java 2009-06-30 09:29:35 UTC (rev 1510) <br>+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java 2009-06-30 09:39:07 UTC (rev 1511) <br>@@ -52,8 +52,8 @@ <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Returns the header values with the specified header name. <br>&nbsp; &nbsp; &nbsp; * <br>- &nbsp; &nbsp; * @return the {@link List} of header values of {@code null} if there is <br>- &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; no such header <br>+ &nbsp; &nbsp; * @return the {@link List} of header values. &nbsp;An empty list if there is no <br>+ &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; such header. <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;List&lt;String&gt; getHeaders(String name); <br>&nbsp; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3180690&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3180608 2009-06-30T02:29:35Z 2009-06-30T02:29:35Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:29:35 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1510 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java <br>Log: <br>Added more HTTP header constants useful for MIME representation <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java 2009-06-30 09:19:34 UTC (rev 1509) <br>+++ trunk/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java 2009-06-30 09:29:35 UTC (rev 1510) <br>@@ -96,6 +96,10 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String CONTENT_LOCATION = &quot;Content-Location&quot;; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;Content-Transfer-Encoding&quot;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public static final String CONTENT_TRANSFER_ENCODING = &quot;Content-Transfer-Encoding&quot;; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;Content-MD5&quot;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String CONTENT_MD5 = &quot;Content-MD5&quot;; <br>@@ -250,6 +254,14 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public static final class Values { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;base64&quot;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public static final String BASE64 = &quot;base64&quot;; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;binary&quot;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public static final String BINARY = &quot;binary&quot;; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;bytes&quot;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String BYTES = &quot;bytes&quot;; <br>@@ -338,6 +350,10 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String PUBLIC = &quot;public&quot;; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;quoted-printable&quot;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public static final String QUOTED_PRINTABLE = &quot;quoted-printable&quot;; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; * {@code &quot;s-maxage&quot;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public static final String S_MAXAGE = &quot;s-maxage&quot;; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3180608&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3180508 2009-06-30T02:19:35Z 2009-06-30T02:19:35Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:19:34 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1509 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>Put some notes about the current issues with HTTP tunneling transport implementation <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java 2009-06-30 09:17:50 UTC (rev 1508) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java 2009-06-30 09:19:34 UTC (rev 1509) <br>@@ -106,7 +106,14 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Exception ex) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;success = false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;cause = ex; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// If the inbound connection was closed before <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// forwarding the received message, wait for <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// a while (reconnectTimeoutMillis) so that the <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// client can recover from the disconnection. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (awaitReconnect()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Write again if the client reconnected. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: What if failed consecutively? <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;We need a loop instead of nested exception handling. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;outputStream.write(b); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;outputStream.flush(); <br>@@ -116,8 +123,15 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;cause = ex2; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Client did not reconnect within the reconnect timeout. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Close the outbound connection. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;invalidateHttpSession(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;e.getChannel().close(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: What happens if the client connects to <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the server at this point with the old session ID? <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;We have to make sure no new session is created, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;perhaps by keeping an LRU cache of the destroyed <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;session IDs. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} finally { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reconnectLock.unlock(); <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 09:17:50 UTC (rev 1508) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-30 09:19:34 UTC (rev 1509) <br>@@ -22,7 +22,8 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.http; <br>&nbsp; <br>-import static org.jboss.netty.channel.Channels.*; <br>+import static org.jboss.netty.channel.Channels.fireChannelOpen; <br>+import static org.jboss.netty.channel.Channels.fireExceptionCaught; <br>&nbsp; <br>&nbsp;import java.net.InetSocketAddress; <br>&nbsp;import java.net.SocketAddress; <br>@@ -237,6 +238,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (closed) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalStateException(&quot;channel closed&quot;); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// XXX: What if a user writes something during the connection attempt? <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (reconnectLock.tryLock()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;awaitingInitialResponse = true; <br>@@ -284,8 +286,17 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byte[] bytes = new byte[buf.readableBytes()]; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.getBytes(0, bytes); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (awaitingInitialResponse) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: This is fragile - should use HTTP codec. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Utilize keep-alive if possible to reduce reconnection overhead. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Consider non-200 status code. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;If the status code is not 200, no more reconnection attempt <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;should be made. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String line = new String(bytes); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (line.contains(&quot;Set-Cookie&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: Session ID length can be different between containers. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// XXX: If the session ID in the response is different from <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session ID specified in the request, then it means <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// &nbsp; &nbsp; &nbsp;the session has timed out. &nbsp;If so, channel must be closed. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int start = line.indexOf(&quot;JSESSIONID=&quot;) + 11; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int end = line.indexOf(&quot;;&quot;, start); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sessionId = line.substring(start, end); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3180508&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3180491 2009-06-30T02:17:50Z 2009-06-30T02:17:50Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-30 05:17:50 -0400 (Tue, 30 Jun 2009) <br>New Revision: 1508 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java <br>Log: <br>Store datagram channel's remoteAddress as much as possible within the extent that does not cause a race condition <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java 2009-06-30 01:16:54 UTC (rev 1507) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java 2009-06-30 09:17:50 UTC (rev 1508) <br>@@ -22,7 +22,8 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.nio; <br>&nbsp; <br>-import static org.jboss.netty.channel.Channels.*; <br>+import static org.jboss.netty.channel.Channels.fireChannelInterestChanged; <br>+import static org.jboss.netty.channel.Channels.fireChannelOpen; <br>&nbsp; <br>&nbsp;import java.io.IOException; <br>&nbsp;import java.net.InetAddress; <br>@@ -121,6 +122,7 @@ <br>&nbsp; &nbsp; &nbsp;volatile boolean inWriteNowLoop; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private volatile InetSocketAddress localAddress; <br>+ &nbsp; &nbsp;volatile InetSocketAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;NioDatagramChannel(final ChannelFactory factory, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final ChannelPipeline pipeline, final ChannelSink sink, <br>@@ -158,12 +160,17 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) datagramChannel.socket().getRemoteSocketAddress(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress remoteAddress = this.remoteAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) datagramChannel.socket().getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return remoteAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java 2009-06-30 01:16:54 UTC (rev 1507) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java 2009-06-30 09:17:50 UTC (rev 1508) <br>@@ -22,7 +22,11 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.nio; <br>&nbsp; <br>-import static org.jboss.netty.channel.Channels.*; <br>+import static org.jboss.netty.channel.Channels.fireChannelBound; <br>+import static org.jboss.netty.channel.Channels.fireChannelClosed; <br>+import static org.jboss.netty.channel.Channels.fireChannelConnected; <br>+import static org.jboss.netty.channel.Channels.fireChannelUnbound; <br>+import static org.jboss.netty.channel.Channels.fireExceptionCaught; <br>&nbsp; <br>&nbsp;import java.net.InetSocketAddress; <br>&nbsp;import java.net.SocketAddress; <br>@@ -174,6 +178,10 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); <br>&nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// Clear the cached address so that the next getRemoteAddress() call <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// updates the cache. <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.remoteAddress = null; <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getDatagramChannel().connect(remoteAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;connected = true; <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java 2009-06-30 01:16:54 UTC (rev 1507) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java 2009-06-30 09:17:50 UTC (rev 1508) <br>@@ -22,7 +22,7 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.oio; <br>&nbsp; <br>-import static org.jboss.netty.channel.Channels.*; <br>+import static org.jboss.netty.channel.Channels.fireChannelOpen; <br>&nbsp; <br>&nbsp;import java.io.IOException; <br>&nbsp;import java.net.InetAddress; <br>@@ -58,6 +58,7 @@ <br>&nbsp; &nbsp; &nbsp;private final DatagramChannelConfig config; <br>&nbsp; &nbsp; &nbsp;volatile Thread workerThread; <br>&nbsp; &nbsp; &nbsp;private volatile InetSocketAddress localAddress; <br>+ &nbsp; &nbsp;volatile InetSocketAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;OioDatagramChannel( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFactory factory, <br>@@ -102,12 +103,17 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.getRemoteSocketAddress(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress remoteAddress = this.remoteAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) socket.getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return remoteAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java 2009-06-30 01:16:54 UTC (rev 1507) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java 2009-06-30 09:17:50 UTC (rev 1508) <br>@@ -22,7 +22,9 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.oio; <br>&nbsp; <br>-import static org.jboss.netty.channel.Channels.*; <br>+import static org.jboss.netty.channel.Channels.fireChannelBound; <br>+import static org.jboss.netty.channel.Channels.fireChannelConnected; <br>+import static org.jboss.netty.channel.Channels.fireExceptionCaught; <br>&nbsp; <br>&nbsp;import java.net.SocketAddress; <br>&nbsp;import java.util.concurrent.Executor; <br>@@ -135,6 +137,10 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.addListener(ChannelFutureListener.CLOSE_ON_FAILURE); <br>&nbsp; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// Clear the cached address so that the next getRemoteAddress() call <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// updates the cache. <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.remoteAddress = null; <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.socket.connect(remoteAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;connected = true; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3180491&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3178439 2009-06-29T18:16:54Z 2009-06-29T18:16:54Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-29 21:16:54 -0400 (Mon, 29 Jun 2009) <br>New Revision: 1507 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/Channels.java <br>Log: <br>Removed unnecessary SuppressWarnings annotations <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/Channels.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/Channels.java 2009-06-27 12:02:25 UTC (rev 1506) <br>+++ trunk/src/main/java/org/jboss/netty/channel/Channels.java 2009-06-30 01:16:54 UTC (rev 1507) <br>@@ -449,8 +449,7 @@ <br>&nbsp; &nbsp; &nbsp; * @param interestOps the new interestOps <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>- &nbsp; &nbsp;public static void fireChannelInterestChanged( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Channel channel, @SuppressWarnings(&quot;unused&quot;) int interestOps) { <br>+ &nbsp; &nbsp;public static void fireChannelInterestChanged(Channel channel, int interestOps) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelInterestChanged(channel); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>@@ -474,13 +473,12 @@ <br>&nbsp; &nbsp; &nbsp; * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} where <br>&nbsp; &nbsp; &nbsp; * the specified {@link ChannelHandlerContext} belongs. <br>&nbsp; &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @param channel &nbsp; &nbsp; the {@link Channel} <br>&nbsp; &nbsp; &nbsp; * @param interestOps the new interestOps <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void fireChannelInterestChanged( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) int interestOps) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, int interestOps) { <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelInterestChanged(ctx); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -691,8 +689,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void bind( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future, SocketAddress localAddress) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;bind(ctx, future, localAddress); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -725,9 +722,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void unbind( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, ChannelFuture future) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;unbind(ctx, future); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>@@ -803,8 +798,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void connect( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future, SocketAddress remoteAddress) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;connect(ctx, future, remoteAddress); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -852,8 +846,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void write( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future, Object message) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;write(ctx, future, message, null); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -914,8 +907,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void write( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future, Object message, SocketAddress remoteAddress) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;write(ctx, future, message, remoteAddress); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -975,8 +967,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void setInterestOps( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFuture future, int interestOps) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setInterestOps(ctx, future, interestOps); <br>&nbsp; &nbsp; &nbsp;} <br>@@ -1024,8 +1015,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void disconnect( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, ChannelFuture future) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;disconnect(ctx, future); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>@@ -1072,8 +1062,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;@Deprecated <br>&nbsp; &nbsp; &nbsp;public static void close( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@SuppressWarnings(&quot;unused&quot;) Channel channel, ChannelFuture future) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelHandlerContext ctx, Channel channel, ChannelFuture future) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;close(ctx, future); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3178439&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3166157 2009-06-27T05:02:25Z 2009-06-27T05:02:25Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-27 08:02:25 -0400 (Sat, 27 Jun 2009) <br>New Revision: 1506 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java <br>Log: <br>Removed unnecessary if statement in setOption <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java 2009-06-27 12:00:38 UTC (rev 1505) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java 2009-06-27 12:02:25 UTC (rev 1506) <br>@@ -25,7 +25,6 @@ <br>&nbsp;import java.net.DatagramSocket; <br>&nbsp;import java.util.Map; <br>&nbsp; <br>-import org.jboss.netty.channel.ReceiveBufferSizePredictor; <br>&nbsp;import org.jboss.netty.channel.socket.DefaultDatagramChannelConfig; <br>&nbsp;import org.jboss.netty.logging.InternalLogger; <br>&nbsp;import org.jboss.netty.logging.InternalLoggerFactory; <br>@@ -81,8 +80,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setWriteBufferLowWaterMark0(ConversionUtil.toInt(value)); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;writeSpinCount&quot;)) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setWriteSpinCount(ConversionUtil.toInt(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;receiveBufferSizePredictor&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setReceiveBufferSizePredictor((ReceiveBufferSizePredictor) value); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3166157&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3166149 2009-06-27T05:00:38Z 2009-06-27T05:00:38Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-27 08:00:38 -0400 (Sat, 27 Jun 2009) <br>New Revision: 1505 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java <br>Log: <br>Fixed a bug where datagram channel configurations are not reflected correctly when set via Bootstrap <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java 2009-06-25 17:14:54 UTC (rev 1504) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java 2009-06-27 12:00:38 UTC (rev 1505) <br>@@ -73,8 +73,18 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setReceiveBufferSize(ConversionUtil.toInt(value)); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;sendBufferSize&quot;)) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSendBufferSize(ConversionUtil.toInt(value)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;receiveBufferSizePredictor&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setReceiveBufferSizePredictor((ReceiveBufferSizePredictor) value); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;reuseAddress&quot;)) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setReuseAddress(ConversionUtil.toBoolean(value)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;loopbackModeDisabled&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setLoopbackModeDisabled(ConversionUtil.toBoolean(value)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;interface&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setInterface((InetAddress) value); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;networkInterface&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setNetworkInterface((NetworkInterface) value); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;timeToLive&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setTimeToLive(ConversionUtil.toInt(value)); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;trafficClass&quot;)) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setTrafficClass(ConversionUtil.toInt(value)); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3166149&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3157722 2009-06-25T10:14:54Z 2009-06-25T10:14:54Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 13:14:54 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1504 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>Fixed a timing issue with SSL handshake <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 10:49:26 UTC (rev 1503) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 17:14:54 UTC (rev 1504) <br>@@ -33,6 +33,7 @@ <br>&nbsp; <br>&nbsp;import javax.net.ssl.SSLContext; <br>&nbsp;import javax.net.ssl.SSLEngine; <br>+import javax.net.ssl.SSLException; <br>&nbsp; <br>&nbsp;import org.jboss.netty.buffer.ChannelBuffer; <br>&nbsp;import org.jboss.netty.buffer.ChannelBuffers; <br>@@ -43,7 +44,6 @@ <br>&nbsp;import org.jboss.netty.channel.ChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ChannelPipelineCoverage; <br>&nbsp;import org.jboss.netty.channel.ChannelSink; <br>-import org.jboss.netty.channel.ChannelStateEvent; <br>&nbsp;import org.jboss.netty.channel.DefaultChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ExceptionEvent; <br>&nbsp;import org.jboss.netty.channel.MessageEvent; <br>@@ -147,7 +147,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;void connectAndSendHeaders(boolean reconnect, HttpTunnelAddress remoteAddress) { <br>+ &nbsp; &nbsp;void connectAndSendHeaders(boolean reconnect, HttpTunnelAddress remoteAddress) throws SSLException { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI url = remoteAddress.getUri(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (reconnect) { <br>@@ -156,6 +156,33 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress connectAddress = new InetSocketAddress(url.getHost(), url.getPort()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.connect(connectAddress).awaitUninterruptibly(); <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// Configure SSL <br>+ &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandler.handshake(channel).awaitUninterruptibly(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// Send the HTTP request. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;StringBuilder builder = new StringBuilder(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;builder.append(&quot;POST &quot;).append(url.getRawPath()).append(&quot; HTTP/1.1&quot;).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR). <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;append(&quot;Host: &quot;).append(url.getHost()).append(&quot;:&quot;).append(url.getPort()).append(HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR). <br>@@ -252,36 +279,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int nextChunkSize = -1; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>- &nbsp; &nbsp; &nbsp; &nbsp;public void channelConnected(ChannelHandlerContext ctx, <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelStateEvent e) throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketChannel ch = (SocketChannel) e.getChannel(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ch.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandler.handshake(channel); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf = (ChannelBuffer) e.getMessage(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byte[] bytes = new byte[buf.readableBytes()]; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3157722&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3154337 2009-06-25T03:49:26Z 2009-06-25T03:49:26Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 06:49:26 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1503 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>Log: <br>Javadoc <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 10:31:00 UTC (rev 1502) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 10:49:26 UTC (rev 1503) <br>@@ -26,6 +26,8 @@ <br>&nbsp;import java.util.Map.Entry; <br>&nbsp; <br>&nbsp;import javax.net.ssl.SSLContext; <br>+import javax.net.ssl.SSLEngine; <br>+import javax.net.ssl.SSLSession; <br>&nbsp; <br>&nbsp;import org.jboss.netty.buffer.ChannelBufferFactory; <br>&nbsp;import org.jboss.netty.channel.ChannelConfig; <br>@@ -51,6 +53,12 @@ <br>&nbsp; * &lt;th&gt;Name&lt;/th&gt;&lt;th&gt;Associated setter method&lt;/th&gt; <br>&nbsp; * &lt;/tr&gt;&lt;tr&gt; <br>&nbsp; * &lt;td&gt;{@code &quot;sslContext&quot;}&lt;/td&gt;&lt;td&gt;{@link #setSslContext(SSLContext)}&lt;/td&gt; <br>+ * &lt;/tr&gt;&lt;tr&gt; <br>+ * &lt;td&gt;{@code &quot;enabledSslCiperSuites&quot;}&lt;/td&gt;&lt;td&gt;{@link #setEnabledSslCipherSuites(String[])}&lt;/td&gt; <br>+ * &lt;/tr&gt;&lt;tr&gt; <br>+ * &lt;td&gt;{@code &quot;enabledSslProtocols&quot;}&lt;/td&gt;&lt;td&gt;{@link #setEnabledSslProtocols(String[])}&lt;/td&gt; <br>+ * &lt;/tr&gt;&lt;tr&gt; <br>+ * &lt;td&gt;{@code &quot;enableSslSessionCreation&quot;}&lt;/td&gt;&lt;td&gt;{@link #setEnableSslSessionCreation(boolean)}&lt;/td&gt; <br>&nbsp; * &lt;/tr&gt; <br>&nbsp; * &lt;/table&gt; <br>&nbsp; * <br>@@ -90,6 +98,12 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.sslContext = sslContext; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the cipher suites enabled for use on an {@link SSLEngine}. <br>+ &nbsp; &nbsp; * If {@code null}, the default value will be used. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @see SSLEngine#getEnabledCipherSuites() <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public String[] getEnabledSslCipherSuites() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] suites = enabledSslCipherSuites; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (suites == null) { <br>@@ -99,6 +113,12 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Sets the cipher suites enabled for use on an {@link SSLEngine}. <br>+ &nbsp; &nbsp; * If {@code null}, the default value will be used. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @see SSLEngine#setEnabledCipherSuites(String[]) <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public void setEnabledSslCipherSuites(String[] suites) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (suites == null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enabledSslCipherSuites = null; <br>@@ -107,6 +127,11 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the protocol versions enabled for use on an {@link SSLEngine}. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @see SSLEngine#getEnabledProtocols() <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public String[] getEnabledSslProtocols() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] protocols = enabledSslProtocols; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (protocols == null) { <br>@@ -116,6 +141,11 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Sets the protocol versions enabled for use on an {@link SSLEngine}. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @see SSLEngine#setEnabledProtocols(String[]) <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public void setEnabledSslProtocols(String[] protocols) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (protocols == null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enabledSslProtocols = null; <br>@@ -124,10 +154,22 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns {@code true} if new {@link SSLSession}s may be established by <br>+ &nbsp; &nbsp; * an {@link SSLEngine}. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @see SSLEngine#getEnableSessionCreation() <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public boolean isEnableSslSessionCreation() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return enableSslSessionCreation; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Sets whether new {@link SSLSession}s may be established by an <br>+ &nbsp; &nbsp; * {@link SSLEngine}. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @see SSLEngine#setEnableSessionCreation(boolean) <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public void setEnableSslSessionCreation(boolean flag) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enableSslSessionCreation = flag; <br>&nbsp; &nbsp; &nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3154337&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3157651 2009-06-25T03:31:01Z 2009-06-25T03:31:01Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 06:31:00 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1502 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>Log: <br>Fixed incorrect option handling <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 10:26:04 UTC (rev 1501) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 10:31:00 UTC (rev 1502) <br>@@ -23,6 +23,7 @@ <br>&nbsp;package org.jboss.netty.channel.socket.http; <br>&nbsp; <br>&nbsp;import java.util.Map; <br>+import java.util.Map.Entry; <br>&nbsp; <br>&nbsp;import javax.net.ssl.SSLContext; <br>&nbsp; <br>@@ -132,10 +133,8 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setOptions(Map&lt;String, Object&gt; options) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setOptions(options); <br>- &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = (SSLContext) options.get(&quot;sslContext&quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSslContext(sslContext); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;for (Entry&lt;String, Object&gt; e: options.entrySet()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setOption(e.getKey(), e.getValue()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3157651&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3154235 2009-06-25T03:26:04Z 2009-06-25T03:26:04Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 06:26:04 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1501 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java <br>Log: <br>Added more configuration parameters for SSLEngine <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 10:10:55 UTC (rev 1500) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 10:26:04 UTC (rev 1501) <br>@@ -254,12 +254,24 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void channelConnected(ChannelHandlerContext ctx, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelStateEvent e) throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = getConfig().getSslContext(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = getConfig(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = config.getSslContext(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Configure the SSLEngine. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnableSessionCreation(config.isEnableSslSessionCreation()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledCipherSuites = config.getEnabledSslCipherSuites(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledCipherSuites != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledCipherSuites(enabledCipherSuites); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String[] enabledProtocols = config.getEnabledSslProtocols(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (enabledProtocols != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setEnabledProtocols(enabledProtocols); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketChannel ch = (SocketChannel) e.getChannel(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 10:10:55 UTC (rev 1500) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 10:26:04 UTC (rev 1501) <br>@@ -31,6 +31,7 @@ <br>&nbsp;import org.jboss.netty.channel.ChannelPipelineFactory; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannel; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannelConfig; <br>+import org.jboss.netty.util.internal.ConversionUtil; <br>&nbsp; <br>&nbsp;/** <br>&nbsp; * The {@link ChannelConfig} of a client-side HTTP tunneling <br>@@ -61,6 +62,9 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel channel; <br>&nbsp; &nbsp; &nbsp;private volatile SSLContext sslContext; <br>+ &nbsp; &nbsp;private volatile String[] enabledSslCipherSuites; <br>+ &nbsp; &nbsp;private volatile String[] enabledSslProtocols; <br>+ &nbsp; &nbsp;private volatile boolean enableSslSessionCreation = true; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Creates a new instance. <br>@@ -85,6 +89,48 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.sslContext = sslContext; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;public String[] getEnabledSslCipherSuites() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;String[] suites = enabledSslCipherSuites; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (suites == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return suites.clone(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setEnabledSslCipherSuites(String[] suites) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (suites == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enabledSslCipherSuites = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enabledSslCipherSuites = suites.clone(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public String[] getEnabledSslProtocols() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;String[] protocols = enabledSslProtocols; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (protocols == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return protocols.clone(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setEnabledSslProtocols(String[] protocols) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (protocols == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enabledSslProtocols = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;enabledSslProtocols = protocols.clone(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public boolean isEnableSslSessionCreation() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return enableSslSessionCreation; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setEnableSslSessionCreation(boolean flag) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;enableSslSessionCreation = flag; <br>+ &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp;public void setOptions(Map&lt;String, Object&gt; options) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setOptions(options); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = (SSLContext) options.get(&quot;sslContext&quot;); <br>@@ -100,6 +146,12 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (key.equals(&quot;sslContext&quot;)) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSslContext((SSLContext) value); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;enabledSslCipherSuites&quot;)){ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setEnabledSslCipherSuites(ConversionUtil.toStringArray(value)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;enabledSslProtocols&quot;)){ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setEnabledSslProtocols(ConversionUtil.toStringArray(value)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;enableSslSessionCreation&quot;)){ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setEnableSslSessionCreation(ConversionUtil.toBoolean(value)); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br><br>Modified: trunk/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java 2009-06-25 10:10:55 UTC (rev 1500) <br>+++ trunk/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java 2009-06-25 10:26:04 UTC (rev 1501) <br>@@ -22,6 +22,9 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.util.internal; <br>&nbsp; <br>+import java.util.ArrayList; <br>+import java.util.List; <br>+ <br>&nbsp;/** <br>&nbsp; * Conversion utility class to parse a property represented as a string or <br>&nbsp; * an object. <br>@@ -77,4 +80,27 @@ <br>&nbsp; &nbsp; &nbsp;private ConversionUtil() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Unused <br>&nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Converts the specified object into an array of strings. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public static String[] toStringArray(Object value) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (value instanceof String[]) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (String[]) value; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (value instanceof Iterable&lt;?&gt;) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;List&lt;String&gt; answer = new ArrayList&lt;String&gt;(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (Object v: (Iterable&lt;?&gt;) value) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (v == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;answer.add(null); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;answer.add(String.valueOf(v)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return answer.toArray(new String[answer.size()]); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return String.valueOf(value).split(&quot;[, \\t\\n\\r\\f\\e\\a]&quot;); <br>+ &nbsp; &nbsp;} <br>&nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3154235&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3154177 2009-06-25T03:10:55Z 2009-06-25T03:10:55Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 06:10:55 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1500 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>* Fixed potential concurrency issues <br>* message queue should be final <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 09:55:00 UTC (rev 1499) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 10:10:55 UTC (rev 1500) <br>@@ -27,6 +27,7 @@ <br>&nbsp;import java.net.InetSocketAddress; <br>&nbsp;import java.net.SocketAddress; <br>&nbsp;import java.net.URI; <br>+import java.util.concurrent.BlockingQueue; <br>&nbsp;import java.util.concurrent.locks.Lock; <br>&nbsp;import java.util.concurrent.locks.ReentrantLock; <br>&nbsp; <br>@@ -77,20 +78,20 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile Thread workerThread; <br>&nbsp; <br>- &nbsp; &nbsp;String sessionId; <br>+ &nbsp; &nbsp;volatile String sessionId; <br>&nbsp; <br>- &nbsp; &nbsp;boolean closed = false; <br>+ &nbsp; &nbsp;volatile boolean closed = false; <br>&nbsp; <br>- &nbsp; &nbsp;LinkedTransferQueue&lt;byte[]&gt; messages = new LinkedTransferQueue&lt;byte[]&gt;(); <br>+ &nbsp; &nbsp;final BlockingQueue&lt;byte[]&gt; messages = new LinkedTransferQueue&lt;byte[]&gt;(); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final ClientSocketChannelFactory clientSocketChannelFactory; <br>&nbsp; <br>- &nbsp; &nbsp;SocketChannel channel; <br>+ &nbsp; &nbsp;volatile SocketChannel channel; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final DelimiterBasedFrameDecoder decoder = new DelimiterBasedFrameDecoder(8092, ChannelBuffers.wrappedBuffer(new byte[] { '\r', '\n' })); <br>&nbsp; &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel.ServletChannelHandler handler = new ServletChannelHandler(); <br>&nbsp; <br>- &nbsp; &nbsp;private HttpTunnelAddress remoteAddress; <br>+ &nbsp; &nbsp;volatile HttpTunnelAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFactory factory, <br>@@ -255,8 +256,9 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelStateEvent e) throws Exception { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = getConfig().getSslContext(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: specify peer host and port. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI uri = remoteAddress.getUri(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;uri.getHost(), uri.getPort()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketChannel ch = (SocketChannel) e.getChannel(); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3154177&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3157646 2009-06-25T02:55:00Z 2009-06-25T02:55:00Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 05:55:00 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1499 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>Log: <br>Made HttpTunnelingSocketChannelConfig public to allow an access to the SslContext property <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 09:47:45 UTC (rev 1498) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 09:55:00 UTC (rev 1499) <br>@@ -27,15 +27,37 @@ <br>&nbsp;import javax.net.ssl.SSLContext; <br>&nbsp; <br>&nbsp;import org.jboss.netty.buffer.ChannelBufferFactory; <br>+import org.jboss.netty.channel.ChannelConfig; <br>&nbsp;import org.jboss.netty.channel.ChannelPipelineFactory; <br>+import org.jboss.netty.channel.socket.SocketChannel; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannelConfig; <br>&nbsp; <br>&nbsp;/** <br>+ * The {@link ChannelConfig} of a client-side HTTP tunneling <br>+ * {@link SocketChannel}. &nbsp;A {@link SocketChannel} created by <br>+ * {@link HttpTunnelingClientSocketChannelFactory} will return an instance of <br>+ * this configuration type for {@link SocketChannel#getConfig()}. <br>+ * <br>+ * &lt;h3&gt;Available options&lt;/h3&gt; <br>+ * <br>+ * In addition to the options provided by {@link SocketChannelConfig}, <br>+ * {@link HttpTunnelingSocketChannelConfig} allows the following options in <br>+ * the option map: <br>+ * <br>+ * &lt;table border=&quot;1&quot; cellspacing=&quot;0&quot; cellpadding=&quot;6&quot;&gt; <br>+ * &lt;tr&gt; <br>+ * &lt;th&gt;Name&lt;/th&gt;&lt;th&gt;Associated setter method&lt;/th&gt; <br>+ * &lt;/tr&gt;&lt;tr&gt; <br>+ * &lt;td&gt;{@code &quot;sslContext&quot;}&lt;/td&gt;&lt;td&gt;{@link #setSslContext(SSLContext)}&lt;/td&gt; <br>+ * &lt;/tr&gt; <br>+ * &lt;/table&gt; <br>+ * <br>&nbsp; * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3157646&i=0" target="_top" rel="nofollow">netty-dev@...</a>) <br>&nbsp; * @author Andy Taylor (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3157646&i=1" target="_top" rel="nofollow">andy.taylor@...</a>) <br>+ * @author Trustin Lee (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3157646&i=2" target="_top" rel="nofollow">tlee@...</a>) <br>&nbsp; * @version $Rev$, $Date$ <br>&nbsp; */ <br>-final class HttpTunnelingSocketChannelConfig implements SocketChannelConfig { <br>+public final class HttpTunnelingSocketChannelConfig implements SocketChannelConfig { <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel channel; <br>&nbsp; &nbsp; &nbsp;private volatile SSLContext sslContext; <br>@@ -47,10 +69,18 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.channel = channel; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the {@link SSLContext} which is used to establish an HTTPS <br>+ &nbsp; &nbsp; * connection. &nbsp;If {@code null}, a plain-text HTTP connection is established. <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public SSLContext getSslContext() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return sslContext; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Sets the {@link SSLContext} which is used to establish an HTTPS connection. <br>+ &nbsp; &nbsp; * If {@code null}, a plain-text HTTP connection is established. <br>+ &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public void setSslContext(SSLContext sslContext) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.sslContext = sslContext; <br>&nbsp; &nbsp; &nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3157646&i=3" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3154080 2009-06-25T02:47:45Z 2009-06-25T02:47:45Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 05:47:45 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1498 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>Log: <br>Added SSL support to the HTTP tunneling client socket channel <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 09:18:14 UTC (rev 1497) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-25 09:47:45 UTC (rev 1498) <br>@@ -30,6 +30,9 @@ <br>&nbsp;import java.util.concurrent.locks.Lock; <br>&nbsp;import java.util.concurrent.locks.ReentrantLock; <br>&nbsp; <br>+import javax.net.ssl.SSLContext; <br>+import javax.net.ssl.SSLEngine; <br>+ <br>&nbsp;import org.jboss.netty.buffer.ChannelBuffer; <br>&nbsp;import org.jboss.netty.buffer.ChannelBuffers; <br>&nbsp;import org.jboss.netty.channel.AbstractChannel; <br>@@ -39,14 +42,15 @@ <br>&nbsp;import org.jboss.netty.channel.ChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ChannelPipelineCoverage; <br>&nbsp;import org.jboss.netty.channel.ChannelSink; <br>+import org.jboss.netty.channel.ChannelStateEvent; <br>&nbsp;import org.jboss.netty.channel.DefaultChannelPipeline; <br>&nbsp;import org.jboss.netty.channel.ExceptionEvent; <br>&nbsp;import org.jboss.netty.channel.MessageEvent; <br>&nbsp;import org.jboss.netty.channel.SimpleChannelUpstreamHandler; <br>&nbsp;import org.jboss.netty.channel.socket.ClientSocketChannelFactory; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannel; <br>-import org.jboss.netty.channel.socket.SocketChannelConfig; <br>&nbsp;import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder; <br>+import org.jboss.netty.handler.ssl.SslHandler; <br>&nbsp;import org.jboss.netty.logging.InternalLogger; <br>&nbsp;import org.jboss.netty.logging.InternalLoggerFactory; <br>&nbsp;import org.jboss.netty.util.internal.LinkedTransferQueue; <br>@@ -63,6 +67,7 @@ <br>&nbsp; &nbsp; &nbsp;static final InternalLogger logger = <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;InternalLoggerFactory.getInstance(HttpTunnelingClientSocketChannel.class); <br>&nbsp; <br>+ &nbsp; &nbsp;private final HttpTunnelingSocketChannelConfig config; <br>&nbsp; &nbsp; &nbsp;private final Lock reconnectLock = new ReentrantLock(); <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;volatile boolean awaitingInitialResponse = true; <br>@@ -82,10 +87,9 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;SocketChannel channel; <br>&nbsp; <br>- &nbsp; &nbsp;private final DelimiterBasedFrameDecoder handler = new DelimiterBasedFrameDecoder(8092, ChannelBuffers.wrappedBuffer(new byte[] { '\r', '\n' })); <br>+ &nbsp; &nbsp;private final DelimiterBasedFrameDecoder decoder = new DelimiterBasedFrameDecoder(8092, ChannelBuffers.wrappedBuffer(new byte[] { '\r', '\n' })); <br>+ &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel.ServletChannelHandler handler = new ServletChannelHandler(); <br>&nbsp; <br>- &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel.ServletChannelHandler servletHandler = new ServletChannelHandler(); <br>- <br>&nbsp; &nbsp; &nbsp;private HttpTunnelAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel( <br>@@ -94,18 +98,16 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelSink sink, ClientSocketChannelFactory clientSocketChannelFactory) { <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;super(null, factory, pipeline, sink); <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.clientSocketChannelFactory = clientSocketChannelFactory; <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;DefaultChannelPipeline channelPipeline = new DefaultChannelPipeline(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;DelimiterBasedFrameDecoder&quot;, handler); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;servletHandler&quot;, servletHandler); <br>- &nbsp; &nbsp; &nbsp; &nbsp;channel = clientSocketChannelFactory.newChannel(channelPipeline); <br>- <br>+ &nbsp; &nbsp; &nbsp; &nbsp;createSocketChannel(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;config = new HttpTunnelingSocketChannelConfig(this); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelOpen(this); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;public SocketChannelConfig getConfig() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return channel.getConfig(); <br>+ &nbsp; &nbsp;public HttpTunnelingSocketChannelConfig getConfig() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return config; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getLocalAddress() { <br>@@ -117,7 +119,7 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return channel.isOpen(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.isBound(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isConnected() { <br>@@ -149,10 +151,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;URI url = remoteAddress.getUri(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (reconnect) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;closeSocket(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;DefaultChannelPipeline channelPipeline = new DefaultChannelPipeline(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;DelimiterBasedFrameDecoder&quot;, handler); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;servletHandler&quot;, servletHandler); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel = clientSocketChannelFactory.newChannel(channelPipeline); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;createSocketChannel(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress connectAddress = new InetSocketAddress(url.getHost(), url.getPort()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.connect(connectAddress).awaitUninterruptibly(); <br>@@ -170,6 +169,16 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.write(ChannelBuffers.copiedBuffer(msg, &quot;ASCII&quot;)); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;private void createSocketChannel() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;DefaultChannelPipeline channelPipeline = new DefaultChannelPipeline(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;decoder&quot;, decoder); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channelPipeline.addLast(&quot;handler&quot;, handler); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel = clientSocketChannelFactory.newChannel(channelPipeline); <br>+ &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp;int sendChunk(ChannelBuffer a) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int size = a.readableBytes(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;String hex = Integer.toHexString(size) + HttpTunnelingClientSocketPipelineSink.LINE_TERMINATOR; <br>@@ -242,6 +251,23 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int nextChunkSize = -1; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp; &nbsp; &nbsp;public void channelConnected(ChannelHandlerContext ctx, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelStateEvent e) throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = getConfig().getSslContext(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// FIXME: specify peer host and port. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SSLEngine engine = sslContext.createSSLEngine(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;engine.setUseClientMode(true); <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SocketChannel ch = (SocketChannel) e.getChannel(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;SslHandler sslHandler = new SslHandler(engine); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ch.getPipeline().addFirst(&quot;ssl&quot;, sslHandler); <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;sslHandler.handshake(channel); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buf = (ChannelBuffer) e.getMessage(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byte[] bytes = new byte[buf.readableBytes()]; <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 09:18:14 UTC (rev 1497) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java 2009-06-25 09:47:45 UTC (rev 1498) <br>@@ -22,243 +22,154 @@ <br>&nbsp; */ <br>&nbsp;package org.jboss.netty.channel.socket.http; <br>&nbsp; <br>-import java.net.Socket; <br>-import java.net.SocketException; <br>+import java.util.Map; <br>&nbsp; <br>-import org.jboss.netty.channel.ChannelException; <br>-import org.jboss.netty.channel.DefaultChannelConfig; <br>+import javax.net.ssl.SSLContext; <br>+ <br>+import org.jboss.netty.buffer.ChannelBufferFactory; <br>+import org.jboss.netty.channel.ChannelPipelineFactory; <br>&nbsp;import org.jboss.netty.channel.socket.SocketChannelConfig; <br>-import org.jboss.netty.util.internal.ConversionUtil; <br>&nbsp; <br>&nbsp;/** <br>&nbsp; * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3154080&i=0" target="_top" rel="nofollow">netty-dev@...</a>) <br>&nbsp; * @author Andy Taylor (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3154080&i=1" target="_top" rel="nofollow">andy.taylor@...</a>) <br>&nbsp; * @version $Rev$, $Date$ <br>&nbsp; */ <br>-final class HttpTunnelingSocketChannelConfig extends DefaultChannelConfig <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; implements SocketChannelConfig { <br>+final class HttpTunnelingSocketChannelConfig implements SocketChannelConfig { <br>&nbsp; <br>- &nbsp; &nbsp;final Socket socket; <br>- &nbsp; &nbsp;private Integer trafficClass; <br>- &nbsp; &nbsp;private Boolean tcpNoDelay; <br>- &nbsp; &nbsp;private Integer soLinger; <br>- &nbsp; &nbsp;private Integer sendBufferSize; <br>- &nbsp; &nbsp;private Boolean reuseAddress; <br>- &nbsp; &nbsp;private Integer receiveBufferSize; <br>- &nbsp; &nbsp;private Integer connectionTime; <br>- &nbsp; &nbsp;private Integer latency; <br>- &nbsp; &nbsp;private Integer bandwidth; <br>- &nbsp; &nbsp;private Boolean keepAlive; <br>+ &nbsp; &nbsp;private final HttpTunnelingClientSocketChannel channel; <br>+ &nbsp; &nbsp;private volatile SSLContext sslContext; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Creates a new instance. <br>&nbsp; &nbsp; &nbsp; */ <br>- &nbsp; &nbsp;HttpTunnelingSocketChannelConfig(Socket socket) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.socket = socket; <br>+ &nbsp; &nbsp;HttpTunnelingSocketChannelConfig(HttpTunnelingClientSocketChannel channel) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.channel = channel; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp;public SSLContext getSslContext() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return sslContext; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setSslContext(SSLContext sslContext) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.sslContext = sslContext; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setOptions(Map&lt;String, Object&gt; options) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setOptions(options); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;SSLContext sslContext = (SSLContext) options.get(&quot;sslContext&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (sslContext != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSslContext(sslContext); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp;public boolean setOption(String key, Object value) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (key.equals(&quot;receiveBufferSize&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setReceiveBufferSize(ConversionUtil.toInt(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;sendBufferSize&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSendBufferSize(ConversionUtil.toInt(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;tcpNoDelay&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setTcpNoDelay(ConversionUtil.toBoolean(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;keepAlive&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setKeepAlive(ConversionUtil.toBoolean(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;reuseAddress&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setReuseAddress(ConversionUtil.toBoolean(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;soLinger&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSoLinger(ConversionUtil.toInt(value)); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (key.equals(&quot;trafficClass&quot;)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setTrafficClass(ConversionUtil.toInt(value)); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (channel.channel.getConfig().setOption(key, value)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (key.equals(&quot;sslContext&quot;)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;setSslContext((SSLContext) value); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public int getReceiveBufferSize() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getReceiveBufferSize(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getReceiveBufferSize(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public int getSendBufferSize() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getSendBufferSize(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getSendBufferSize(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public int getSoLinger() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getSoLinger(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getSoLinger(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public int getTrafficClass() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getTrafficClass(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getTrafficClass(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isKeepAlive() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getKeepAlive(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().isKeepAlive(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isReuseAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getReuseAddress(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().isReuseAddress(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isTcpNoDelay() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return socket.getTcpNoDelay(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().isTcpNoDelay(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setKeepAlive(boolean keepAlive) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.keepAlive = keepAlive; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setKeepAlive(keepAlive); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setKeepAlive(keepAlive); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setPerformancePreferences( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int connectionTime, int latency, int bandwidth) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.connectionTime = connectionTime; <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.latency = latency; <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.bandwidth = bandwidth; <br>- &nbsp; &nbsp; &nbsp; &nbsp;socket.setPerformancePreferences(connectionTime, latency, bandwidth); <br>- <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setPerformancePreferences(connectionTime, latency, bandwidth); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setReceiveBufferSize(int receiveBufferSize) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.receiveBufferSize = receiveBufferSize; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setReceiveBufferSize(receiveBufferSize); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setReceiveBufferSize(receiveBufferSize); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setReuseAddress(boolean reuseAddress) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.reuseAddress = reuseAddress; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setReuseAddress(reuseAddress); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setReuseAddress(reuseAddress); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setSendBufferSize(int sendBufferSize) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.sendBufferSize = sendBufferSize; <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (socket != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setSendBufferSize(sendBufferSize); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setSendBufferSize(sendBufferSize); <br>+ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setSoLinger(int soLinger) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.soLinger = soLinger; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (soLinger &lt; 0) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setSoLinger(false, 0); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setSoLinger(true, soLinger); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setSoLinger(soLinger); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setTcpNoDelay(boolean tcpNoDelay) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.tcpNoDelay = tcpNoDelay; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setTcpNoDelay(tcpNoDelay); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setTcpNoDelay(tcpNoDelay); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public void setTrafficClass(int trafficClass) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;this.trafficClass = trafficClass; <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;socket.setTrafficClass(trafficClass); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;catch (SocketException e) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new ChannelException(e); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setTrafficClass(trafficClass); <br>+ &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;public ChannelBufferFactory getBufferFactory() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getBufferFactory(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp;HttpTunnelingSocketChannelConfig copyConfig(Socket socket) { <br>- &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingSocketChannelConfig config = new HttpTunnelingSocketChannelConfig(socket); <br>- &nbsp; &nbsp; &nbsp; &nbsp;config.setConnectTimeoutMillis(getConnectTimeoutMillis()); <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (trafficClass != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setTrafficClass(trafficClass); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (tcpNoDelay != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setTcpNoDelay(tcpNoDelay); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (soLinger != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setSoLinger(soLinger); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (sendBufferSize != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setSendBufferSize(sendBufferSize); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (reuseAddress != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setReuseAddress(reuseAddress); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (receiveBufferSize != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setReceiveBufferSize(receiveBufferSize); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (keepAlive != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setKeepAlive(keepAlive); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (connectionTime != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;config.setPerformancePreferences(connectionTime, latency, bandwidth); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;return config; <br>+ &nbsp; &nbsp;public int getConnectTimeoutMillis() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getConnectTimeoutMillis(); <br>&nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public ChannelPipelineFactory getPipelineFactory() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getPipelineFactory(); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;@Deprecated <br>+ &nbsp; &nbsp;public int getWriteTimeoutMillis() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return channel.channel.getConfig().getWriteTimeoutMillis(); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setBufferFactory(ChannelBufferFactory bufferFactory) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setBufferFactory(bufferFactory); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setConnectTimeoutMillis(int connectTimeoutMillis) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setConnectTimeoutMillis(connectTimeoutMillis); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void setPipelineFactory(ChannelPipelineFactory pipelineFactory) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setPipelineFactory(pipelineFactory); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;@Deprecated <br>+ &nbsp; &nbsp;public void setWriteTimeoutMillis(int writeTimeoutMillis) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;channel.channel.getConfig().setWriteTimeoutMillis(writeTimeoutMillis); <br>+ &nbsp; &nbsp;} <br>&nbsp;} <br>\ No newline at end of file <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3154080&i=2" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3153958 2009-06-25T02:18:14Z 2009-06-25T02:18:14Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 05:18:14 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1497 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java <br>Log: <br>Fixed NPE in OioWorker.write when the socket is closed already <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java 2009-06-25 07:45:15 UTC (rev 1496) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java 2009-06-25 09:18:14 UTC (rev 1497) <br>@@ -117,7 +117,15 @@ <br>&nbsp; &nbsp; &nbsp;static void write( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;OioSocketChannel channel, ChannelFuture future, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Object message) { <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;OutputStream out = channel.getOutputStream(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (out == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Exception e = new ClosedChannelException(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;future.setFailure(e); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught(channel, e); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer a = (ChannelBuffer) message; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int bytes = a.readableBytes(); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3153958&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3153670 2009-06-25T00:45:15Z 2009-06-25T00:45:15Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-25 03:45:15 -0400 (Thu, 25 Jun 2009) <br>New Revision: 1496 <br><br>Added: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java <br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java <br>Log: <br>Fixed NETTY-184 Provide NIO equivalent for ChunkedFile and ChunkedStream <br>* Added ChunkedNioFile and ChunkedNioStream <br>* Added another convenience constructor to ChunkedFile <br><br>Modified: trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java 2009-06-24 18:12:00 UTC (rev 1495) <br>+++ trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java 2009-06-25 07:45:15 UTC (rev 1496) <br>@@ -62,6 +62,13 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedFile(RandomAccessFile file) throws IOException { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this(file, ChunkedStream.DEFAULT_CHUNK_SIZE); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>&nbsp; &nbsp; &nbsp; * <br>&nbsp; &nbsp; &nbsp; * @param chunkSize the number of bytes to fetch on each <br>&nbsp; &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{@link #nextChunk()} call <br><br>Added: trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(rev 0) <br>+++ trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java 2009-06-25 07:45:15 UTC (rev 1496) <br>@@ -0,0 +1,173 @@ <br>+/* <br>+ * JBoss, Home of Professional Open Source <br>+ * <br>+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors <br>+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a <br>+ * full listing of individual contributors. <br>+ * <br>+ * This is free software; you can redistribute it and/or modify it <br>+ * under the terms of the GNU Lesser General Public License as <br>+ * published by the Free Software Foundation; either version 2.1 of <br>+ * the License, or (at your option) any later version. <br>+ * <br>+ * This software is distributed in the hope that it will be useful, <br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of <br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU <br>+ * Lesser General Public License for more details. <br>+ * <br>+ * You should have received a copy of the GNU Lesser General Public <br>+ * License along with this software; if not, write to the Free <br>+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA <br>+ * 02110-1301 USA, or see the FSF site: <a href="http://www.fsf.org" target="_top" rel="nofollow">http://www.fsf.org</a>. <br>+ */ <br>+package org.jboss.netty.handler.stream; <br>+ <br>+import static org.jboss.netty.buffer.ChannelBuffers.*; <br>+ <br>+import java.io.File; <br>+import java.io.FileInputStream; <br>+import java.io.IOException; <br>+import java.nio.ByteBuffer; <br>+import java.nio.channels.FileChannel; <br>+ <br>+/** <br>+ * A {@link ChunkedInput} that fetches data from a file chunk by chunk using <br>+ * NIO {@link FileChannel}. <br>+ * <br>+ * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3153670&i=0" target="_top" rel="nofollow">netty-dev@...</a>) <br>+ * @author Trustin Lee (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3153670&i=1" target="_top" rel="nofollow">tlee@...</a>) <br>+ * @author Frederic Bregier <br>+ * @version $Rev$, $Date$ <br>+ */ <br>+public class ChunkedNioFile implements ChunkedInput { <br>+ <br>+ &nbsp; &nbsp;private final FileChannel in; <br>+ &nbsp; &nbsp;private long startOffset; <br>+ &nbsp; &nbsp;private final long endOffset; <br>+ &nbsp; &nbsp;private final int chunkSize; <br>+ &nbsp; &nbsp;private volatile long offset; <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioFile(File in) throws IOException { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this(new FileInputStream(in).getChannel()); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @param chunkSize the number of bytes to fetch on each <br>+ &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{@link #nextChunk()} call <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioFile(File in, int chunkSize) throws IOException { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this(new FileInputStream(in).getChannel(), chunkSize); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioFile(FileChannel in) throws IOException { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this(in, ChunkedStream.DEFAULT_CHUNK_SIZE); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @param chunkSize the number of bytes to fetch on each <br>+ &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{@link #nextChunk()} call <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioFile(FileChannel in, int chunkSize) throws IOException { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this(in, 0, in.size(), chunkSize); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified file. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @param offset the offset of the file where the transfer begins <br>+ &nbsp; &nbsp; * @param length the number of bytes to transfer <br>+ &nbsp; &nbsp; * @param chunkSize the number of bytes to fetch on each <br>+ &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{@link #nextChunk()} call <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioFile(FileChannel in, long offset, long length, int chunkSize) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throws IOException { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (in == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new NullPointerException(&quot;in&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (offset &lt; 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalArgumentException( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;offset: &quot; + offset + &quot; (expected: 0 or greater)&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (length &lt; 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalArgumentException( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;length: &quot; + length + &quot; (expected: 0 or greater)&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (chunkSize &lt;= 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalArgumentException( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;chunkSize: &quot; + chunkSize + <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot; (expected: a positive integer)&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (offset != 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;in.position(offset); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.in = in; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.chunkSize = chunkSize; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.offset = startOffset = offset; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;endOffset = offset + length; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the offset in the file where the transfer began. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public long getStartOffset() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return startOffset; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the offset in the file where the transfer will end. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public long getEndOffset() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return endOffset; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the offset in the file where the transfer is happening currently. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public long getCurrentOffset() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return offset; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public boolean hasNextChunk() throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return offset &lt; endOffset && in.isOpen(); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void close() throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;in.close(); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public Object nextChunk() throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;long offset = this.offset; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (offset &gt;= endOffset) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;int chunkSize = (int) Math.min(this.chunkSize, endOffset - offset); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;byte[] chunkArray = new byte[chunkSize]; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;ByteBuffer chunk = ByteBuffer.wrap(chunkArray); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;int readBytes = 0; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int localReadBytes = in.read(chunk); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (localReadBytes &lt; 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;readBytes += localReadBytes; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (readBytes == chunkSize) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.offset += readBytes; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return wrappedBuffer(chunkArray); <br>+ &nbsp; &nbsp;} <br>+} <br><br><br>Property changes on: trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java <br>___________________________________________________________________ <br>Name: svn:keywords <br>&nbsp; &nbsp;+ Rev Date <br>Name: svn:eol-style <br>&nbsp; &nbsp;+ native <br><br>Added: trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(rev 0) <br>+++ trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java 2009-06-25 07:45:15 UTC (rev 1496) <br>@@ -0,0 +1,141 @@ <br>+/* <br>+ * JBoss, Home of Professional Open Source <br>+ * <br>+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors <br>+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a <br>+ * full listing of individual contributors. <br>+ * <br>+ * This is free software; you can redistribute it and/or modify it <br>+ * under the terms of the GNU Lesser General Public License as <br>+ * published by the Free Software Foundation; either version 2.1 of <br>+ * the License, or (at your option) any later version. <br>+ * <br>+ * This software is distributed in the hope that it will be useful, <br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of <br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU <br>+ * Lesser General Public License for more details. <br>+ * <br>+ * You should have received a copy of the GNU Lesser General Public <br>+ * License along with this software; if not, write to the Free <br>+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA <br>+ * 02110-1301 USA, or see the FSF site: <a href="http://www.fsf.org" target="_top" rel="nofollow">http://www.fsf.org</a>. <br>+ */ <br>+package org.jboss.netty.handler.stream; <br>+ <br>+import static org.jboss.netty.buffer.ChannelBuffers.*; <br>+ <br>+import java.nio.ByteBuffer; <br>+import java.nio.channels.ReadableByteChannel; <br>+ <br>+import org.jboss.netty.buffer.ChannelBuffer; <br>+ <br>+/** <br>+ * A {@link ChunkedInput} that fetches data from a {@link ReadableByteChannel} <br>+ * chunk by chunk. &nbsp;Please note that the {@link ReadableByteChannel} must <br>+ * operate in blocking mode. &nbsp;Non-blocking mode channels are not supported. <br>+ * <br>+ * @author The Netty Project (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3153670&i=2" target="_top" rel="nofollow">netty-dev@...</a>) <br>+ * @author Trustin Lee (<a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3153670&i=3" target="_top" rel="nofollow">tlee@...</a>) <br>+ * @author Frederic Bregier <br>+ * @version $Rev$, $Date$ <br>+ */ <br>+public class ChunkedNioStream implements ChunkedInput { <br>+ <br>+ &nbsp; &nbsp;private final ReadableByteChannel in; <br>+ <br>+ &nbsp; &nbsp;private final int chunkSize; <br>+ &nbsp; &nbsp;private volatile long offset; <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Associated ByteBuffer <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;private ByteBuffer byteBuffer = null; <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified channel. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioStream(ReadableByteChannel in) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this(in, ChunkedStream.DEFAULT_CHUNK_SIZE); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Creates a new instance that fetches data from the specified channel. <br>+ &nbsp; &nbsp; * <br>+ &nbsp; &nbsp; * @param chunkSize the number of bytes to fetch on each <br>+ &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{@link #nextChunk()} call <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public ChunkedNioStream(ReadableByteChannel in, int chunkSize) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (in == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new NullPointerException(&quot;in&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (chunkSize &lt;= 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalArgumentException(&quot;chunkSize: &quot; + chunkSize + <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot; (expected: a positive integer)&quot;); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.in = in; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;offset = 0; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;this.chunkSize = chunkSize; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (byteBuffer != null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (byteBuffer.capacity() != chunkSize) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byteBuffer = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byteBuffer = ByteBuffer.allocate(chunkSize); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;byteBuffer = ByteBuffer.allocate(chunkSize); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; * Returns the number of transferred bytes. <br>+ &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp;public long getTransferredBytes() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return offset; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public boolean hasNextChunk() throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (byteBuffer.position() &gt; 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// A previous read was not over, so there is a next chunk in the buffer at least <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (in.isOpen()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Try to read a new part, and keep this part (no rewind) <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int b = in.read(byteBuffer); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (b &lt; 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;offset += b; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public void close() throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;in.close(); <br>+ &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;public Object nextChunk() throws Exception { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (!hasNextChunk()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// buffer cannot be not be empty from there <br>+ &nbsp; &nbsp; &nbsp; &nbsp;int readBytes = byteBuffer.position(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;int localReadBytes = in.read(byteBuffer); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (localReadBytes &lt; 0) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;readBytes += localReadBytes; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;offset += localReadBytes; <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (readBytes == chunkSize) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;byteBuffer.flip(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;// copy since buffer is keeped for next usage <br>+ &nbsp; &nbsp; &nbsp; &nbsp;ChannelBuffer buffer = copiedBuffer(byteBuffer); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;byteBuffer.clear(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return buffer; <br>+ &nbsp; &nbsp;} <br>+} <br><br><br>Property changes on: trunk/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java <br>___________________________________________________________________ <br>Name: svn:keywords <br>&nbsp; &nbsp;+ Rev Date <br>Name: svn:eol-style <br>&nbsp; &nbsp;+ native <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3153670&i=4" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3150471 2009-06-24T11:12:00Z 2009-06-24T11:12:00Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-24 14:12:00 -0400 (Wed, 24 Jun 2009) <br>New Revision: 1495 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>Log: <br>Fix for NETTY-183 Client-side HTTP tunneling transport logs and swallows an exceptionCaught event. <br>* HttpTunnelingClientSocketChannel.ServletChannelHandler does not log the caught exception anymore. The exception is propagated to the HttpTunnelingClientSocketChannel's pipeline. <br>* More comprehensive log message on the server side <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java 2009-06-24 02:58:10 UTC (rev 1494) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingChannelHandler.java 2009-06-24 18:12:00 UTC (rev 1495) <br>@@ -134,7 +134,7 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp;public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp;logger.warn(&quot;Unexpected exception&quot;, e.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;logger.warn(&quot;Unexpected exception while HTTP tunneling&quot;, e.getCause()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;invalidateHttpSession(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;e.getChannel().close(); <br>&nbsp; &nbsp; &nbsp;} <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-24 02:58:10 UTC (rev 1494) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java 2009-06-24 18:12:00 UTC (rev 1495) <br>@@ -278,7 +278,9 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;@Override <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;logger.warn(&quot;Unexpected exception&quot;, e.getCause()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireExceptionCaught( <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;HttpTunnelingClientSocketChannel.this, <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;e.getCause()); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;channel.close(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3150471&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3146477 2009-06-23T19:58:10Z 2009-06-23T19:58:10Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-23 22:58:10 -0400 (Tue, 23 Jun 2009) <br>New Revision: 1494 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java <br>Log: <br>NETTY-182 NIO server socket sometimes does not shut down <br>* Should not break the loop after swallowing exceptions in Boss. <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java 2009-06-24 02:49:26 UTC (rev 1493) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java 2009-06-24 02:58:10 UTC (rev 1494) <br>@@ -239,10 +239,8 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// raised. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (CancelledKeyException e) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Raised by accept() when the server socket was closed. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (ClosedSelectorException e) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Raised by accept() when the server socket was closed. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (ClosedChannelException e) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Closed as requested. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3146477&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3146444 2009-06-23T19:49:26Z 2009-06-23T19:49:26Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-23 22:49:26 -0400 (Tue, 23 Jun 2009) <br>New Revision: 1493 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java <br>Log: <br>NETTY-182 NIO server socket sometimes does not shut down <br>* Swallow ClosedSelectorException <br>* channel.isBound() check for each loop <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java 2009-06-23 16:08:15 UTC (rev 1492) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java 2009-06-24 02:49:26 UTC (rev 1493) <br>@@ -30,6 +30,7 @@ <br>&nbsp;import java.net.SocketTimeoutException; <br>&nbsp;import java.nio.channels.CancelledKeyException; <br>&nbsp;import java.nio.channels.ClosedChannelException; <br>+import java.nio.channels.ClosedSelectorException; <br>&nbsp;import java.util.concurrent.Executor; <br>&nbsp;import java.util.concurrent.atomic.AtomicInteger; <br>&nbsp; <br>@@ -207,7 +208,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void run() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;while (channel.isBound()) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// We do not call ServerSocketChannel.accept() directly <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// because SocketTimeoutException is not raised on some <br>@@ -238,6 +239,10 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// raised. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (CancelledKeyException e) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Raised by accept() when the server socket was closed. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (ClosedSelectorException e) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Raised by accept() when the server socket was closed. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (ClosedChannelException e) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Closed as requested. <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3146444&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3143428 2009-06-23T09:08:16Z 2009-06-23T09:08:16Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-23 12:08:15 -0400 (Tue, 23 Jun 2009) <br>New Revision: 1492 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java <br>Log: <br>Backported upstream updates for LinkedTransferQueue (NETTY-181) <br><br>Modified: trunk/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java 2009-06-23 07:52:12 UTC (rev 1491) <br>+++ trunk/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java 2009-06-23 16:08:15 UTC (rev 1492) <br>@@ -47,7 +47,7 @@ <br>&nbsp; * producer. &nbsp;The &lt;em&gt;tail&lt;/em&gt; of the queue is that element that has <br>&nbsp; * been on the queue the shortest time for some producer. <br>&nbsp; * <br>- * &lt;p&gt;Beware that, unlike in most collections, the &lt;tt&gt;size&lt;/tt&gt; <br>+ * &lt;p&gt;Beware that, unlike in most collections, the {@code size} <br>&nbsp; * method is &lt;em&gt;NOT&lt;/em&gt; a constant-time operation. Because of the <br>&nbsp; * asynchronous nature of these queues, determining the current number <br>&nbsp; * of elements requires a traversal of the elements. <br>@@ -157,7 +157,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextUpdater = tmp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;boolean casNext(QNode cmp, QNode val) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;final boolean casNext(QNode cmp, QNode val) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (nextUpdater != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return nextUpdater.compareAndSet(this, cmp, val); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>@@ -165,7 +165,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;private synchronized boolean alternativeCasNext(QNode cmp, QNode val) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;private synchronized final boolean alternativeCasNext(QNode cmp, QNode val) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (next == cmp) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;next = val; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>@@ -173,6 +173,11 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;final void clearNext() { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// nextUpdater.lazySet(this, this); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;next = this; // allows run on java5 <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>@@ -208,7 +213,7 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;private boolean advanceHead(QNode h, QNode nh) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (h == head.get() && head.compareAndSet(h, nh)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;h.next = h; // forget old next <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;h.clearNext(); // forget old next <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>@@ -218,6 +223,7 @@ <br>&nbsp; &nbsp; &nbsp; * Puts or takes an item. Used for most queue operations (except <br>&nbsp; &nbsp; &nbsp; * poll() and tryTransfer()). See the similar code in <br>&nbsp; &nbsp; &nbsp; * SynchronousQueue for detailed explanation. <br>+ &nbsp; &nbsp; * <br>&nbsp; &nbsp; &nbsp; * @param e the item or if null, signifies that this is a take <br>&nbsp; &nbsp; &nbsp; * @param mode the wait mode: NOWAIT, TIMEOUT, WAIT <br>&nbsp; &nbsp; &nbsp; * @param nanos timeout in nanosecs, used only if mode is TIMEOUT <br>@@ -266,7 +272,7 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Version of xfer for poll() and tryTransfer, which <br>- &nbsp; &nbsp; * simplifies control paths both here and in xfer <br>+ &nbsp; &nbsp; * simplifies control paths both here and in xfer. <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;private Object fulfill(Object e) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;boolean isData = e != null; <br>@@ -375,7 +381,7 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * Returns validated tail for use in cleaning methods <br>+ &nbsp; &nbsp; * Returns validated tail for use in cleaning methods. <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;private QNode getValidatedTail() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>@@ -399,6 +405,7 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Gets rid of cancelled node s with original predecessor pred. <br>+ &nbsp; &nbsp; * <br>&nbsp; &nbsp; &nbsp; * @param pred predecessor of cancelled node <br>&nbsp; &nbsp; &nbsp; * @param s the cancelled node <br>&nbsp; &nbsp; &nbsp; */ <br>@@ -410,6 +417,11 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;LockSupport.unpark(w); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (pred == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;/* <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; * At any given time, exactly one node on list cannot be <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; * deleted -- the last inserted node. To accommodate this, if <br>@@ -437,6 +449,7 @@ <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Tries to unsplice the cancelled node held in cleanMe that was <br>&nbsp; &nbsp; &nbsp; * previously uncleanable because it was at tail. <br>+ &nbsp; &nbsp; * <br>&nbsp; &nbsp; &nbsp; * @return current cleanMe node (or null) <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;private QNode reclean() { <br>@@ -474,7 +487,7 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * Creates an initially empty &lt;tt&gt;LinkedTransferQueue&lt;/tt&gt;. <br>+ &nbsp; &nbsp; * Creates an initially empty {@code LinkedTransferQueue}. <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;public LinkedTransferQueue() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode dummy = new QNode(null, false); <br>@@ -484,9 +497,10 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * Creates a &lt;tt&gt;LinkedTransferQueue&lt;/tt&gt; <br>+ &nbsp; &nbsp; * Creates a {@code LinkedTransferQueue} <br>&nbsp; &nbsp; &nbsp; * initially containing the elements of the given collection, <br>&nbsp; &nbsp; &nbsp; * added in traversal order of the collection's iterator. <br>+ &nbsp; &nbsp; * <br>&nbsp; &nbsp; &nbsp; * @param c the collection of elements to initially contain <br>&nbsp; &nbsp; &nbsp; * @throws NullPointerException if the specified collection or any <br>&nbsp; &nbsp; &nbsp; * &nbsp; &nbsp; &nbsp; &nbsp; of its elements are null <br>@@ -526,6 +540,15 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>+ &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp;public boolean add(E e) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (e == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new NullPointerException(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;xfer(e, NOWAIT, 0); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>+ &nbsp; &nbsp;} <br>+ <br>&nbsp; &nbsp; &nbsp;public void transfer(E e) throws InterruptedException { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (e == null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new NullPointerException(); <br>@@ -613,7 +636,7 @@ <br>&nbsp; &nbsp; &nbsp;// Traversal-based methods <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>- &nbsp; &nbsp; * Return head after performing any outstanding helping steps <br>+ &nbsp; &nbsp; * Returns head after performing any outstanding helping steps. <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;QNode traversalHead() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>@@ -637,6 +660,7 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;reclean(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>@@ -653,59 +677,71 @@ <br>&nbsp; &nbsp; &nbsp; * if subsequently removed. <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;class Itr implements Iterator&lt;E&gt; { <br>- &nbsp; &nbsp; &nbsp; &nbsp;QNode nextNode; &nbsp; &nbsp;// Next node to return next <br>- &nbsp; &nbsp; &nbsp; &nbsp;QNode currentNode; // last returned node, for remove() <br>- &nbsp; &nbsp; &nbsp; &nbsp;QNode prevNode; &nbsp; &nbsp;// predecessor of last returned node <br>+ &nbsp; &nbsp; &nbsp; &nbsp;QNode next; &nbsp; &nbsp; &nbsp; &nbsp;// node to return next <br>+ &nbsp; &nbsp; &nbsp; &nbsp;QNode pnext; &nbsp; &nbsp; &nbsp; // predecessor of next <br>+ &nbsp; &nbsp; &nbsp; &nbsp;QNode snext; &nbsp; &nbsp; &nbsp; // successor of next <br>+ &nbsp; &nbsp; &nbsp; &nbsp;QNode curr; &nbsp; &nbsp; &nbsp; &nbsp;// last returned node, for remove() <br>+ &nbsp; &nbsp; &nbsp; &nbsp;QNode pcurr; &nbsp; &nbsp; &nbsp; // predecessor of curr, for remove() <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;E nextItem; &nbsp; &nbsp; &nbsp; &nbsp;// Cache of next item, once commited to in next <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Itr() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextNode = traversalHead(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;advance(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;findNext(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;E advance() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;prevNode = currentNode; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;currentNode = nextNode; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;E x = nextItem; <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode p = nextNode.next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;/** <br>+ &nbsp; &nbsp; &nbsp; &nbsp; * Ensure next points to next valid node, or null if none. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; */ <br>+ &nbsp; &nbsp; &nbsp; &nbsp;void findNext() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (p == null || !p.isData) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextNode = null; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextItem = null; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return x; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode pred = pnext; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode q = next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (pred == null || pred == q) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pred = traversalHead(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;q = pred.next; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Object item = p.get(); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (item != p && item != null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextNode = p; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextItem = cast(item); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return x; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (q == null || !q.isData) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;next = null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;prevNode = p; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;p = p.next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Object x = q.get(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode s = q.next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (x != null && q != x && q != s) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;nextItem = cast(x); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;snext = s; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pnext = pred; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;next = q; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pnext = q; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;next = s; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public boolean hasNext() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return nextNode != null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return next != null; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public E next() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (nextNode == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (next == null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new NoSuchElementException(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return advance(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pcurr = pnext; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;curr = next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pnext = next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;next = snext; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;E x = nextItem; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;findNext(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return x; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;public void remove() { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode p = currentNode; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode prev = prevNode; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (prev == null || p == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode p = curr; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (p == null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;throw new IllegalStateException(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Object x = p.get(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (x != null && x != p && p.compareAndSet(x, p)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;clean(prev, p); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;clean(pcurr, p); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>@@ -765,8 +801,8 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;/** <br>&nbsp; &nbsp; &nbsp; * Returns the number of elements in this queue. &nbsp;If this queue <br>- &nbsp; &nbsp; * contains more than &lt;tt&gt;Integer.MAX_VALUE&lt;/tt&gt; elements, returns <br>- &nbsp; &nbsp; * &lt;tt&gt;Integer.MAX_VALUE&lt;/tt&gt;. <br>+ &nbsp; &nbsp; * contains more than {@code Integer.MAX_VALUE} elements, returns <br>+ &nbsp; &nbsp; * {@code Integer.MAX_VALUE}. <br>&nbsp; &nbsp; &nbsp; * <br>&nbsp; &nbsp; &nbsp; * &lt;p&gt;Beware that, unlike in most collections, this method is <br>&nbsp; &nbsp; &nbsp; * &lt;em&gt;NOT&lt;/em&gt; a constant-time operation. Because of the <br>@@ -806,4 +842,30 @@ <br>&nbsp; &nbsp; &nbsp;public int remainingCapacity() { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return Integer.MAX_VALUE; <br>&nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp;@Override <br>+ &nbsp; &nbsp;public boolean remove(Object o) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (o == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode pred = traversalHead(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;for (;;) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;QNode q = pred.next; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (q == null || !q.isData) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return false; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (q == pred) {// restart <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;break; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Object x = q.get(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (x != null && x != q && o.equals(x) && <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;q.compareAndSet(x, q)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;clean(pred, q); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return true; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pred = q; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp;} <br>&nbsp;} <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3143428&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3140977 2009-06-23T00:52:13Z 2009-06-23T00:52:13Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-23 03:52:12 -0400 (Tue, 23 Jun 2009) <br>New Revision: 1491 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java <br>Log: <br>Fixed issue: NETTY-180 Channel.getRemoteAddress() can return null for a received MessageEvent when ExecutionHandler is in the pipeline. <br>* DatagramChannel implementations cache localAddresses now <br>* DatagramChannel implementations don't cache remoteAddress because a user can disconnect and then connect again. &nbsp;However, MessageEvent.getRemoteAddress() will always have correct remoteAddress value, so it shouldn't be a problem at all. <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java 2009-06-23 07:46:59 UTC (rev 1490) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java 2009-06-23 07:52:12 UTC (rev 1491) <br>@@ -120,6 +120,8 @@ <br>&nbsp; &nbsp; &nbsp; */ <br>&nbsp; &nbsp; &nbsp;volatile boolean inWriteNowLoop; <br>&nbsp; <br>+ &nbsp; &nbsp;private volatile InetSocketAddress localAddress; <br>+ <br>&nbsp; &nbsp; &nbsp;NioDatagramChannel(final ChannelFactory factory, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final ChannelPipeline pipeline, final ChannelSink sink, <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;final NioDatagramWorker worker) { <br>@@ -142,12 +144,17 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getLocalAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) datagramChannel.socket().getLocalSocketAddress(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress localAddress = this.localAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (localAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.localAddress = localAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) datagramChannel.socket().getLocalSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return localAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java 2009-06-23 07:46:59 UTC (rev 1490) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java 2009-06-23 07:52:12 UTC (rev 1491) <br>@@ -57,6 +57,7 @@ <br>&nbsp; &nbsp; &nbsp;final Object interestOpsLock = new Object(); <br>&nbsp; &nbsp; &nbsp;private final DatagramChannelConfig config; <br>&nbsp; &nbsp; &nbsp;volatile Thread workerThread; <br>+ &nbsp; &nbsp;private volatile InetSocketAddress localAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;OioDatagramChannel( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;ChannelFactory factory, <br>@@ -87,11 +88,26 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getLocalAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.getLocalSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress localAddress = this.localAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (localAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.localAddress = localAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) socket.getLocalSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return localAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3140977&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3140956 2009-06-23T00:47:00Z 2009-06-23T00:47:00Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-23 03:46:59 -0400 (Tue, 23 Jun 2009) <br>New Revision: 1490 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java <br>Log: <br>Fixed issue: NETTY-180 Channel.getRemoteAddress() can return null for a received MessageEvent when ExecutionHandler is in the pipeline. <br>* All Channel implementations but DatagramChannel now cache localAddress and remoteAddress so that they do not return null even after the connection has been closed. <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java 2009-06-23 07:20:57 UTC (rev 1489) <br>+++ trunk/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java 2009-06-23 07:46:59 UTC (rev 1490) <br>@@ -69,15 +69,15 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return isOpen() && bound.get(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return bound.get() && isOpen(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isConnected() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return localAddress != null && remoteAddress != null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return pairedChannel != null && isOpen(); <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public LocalAddress getLocalAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return isBound()? localAddress : null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return localAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public LocalAddress getRemoteAddress() { <br>@@ -95,7 +95,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;DefaultLocalChannel pairedChannel = this.pairedChannel; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (pairedChannel != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.pairedChannel = null; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.localAddress = null; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelDisconnected(this); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelUnbound(this); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>@@ -109,7 +108,6 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;DefaultLocalChannel me = pairedChannel.pairedChannel; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (me != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pairedChannel.pairedChannel = null; <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;pairedChannel.localAddress = null; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelDisconnected(pairedChannel); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;fireChannelUnbound(pairedChannel); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java 2009-06-23 07:20:57 UTC (rev 1489) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java 2009-06-23 07:46:59 UTC (rev 1490) <br>@@ -55,6 +55,8 @@ <br>&nbsp; &nbsp; &nbsp;final SocketChannel socket; <br>&nbsp; &nbsp; &nbsp;final NioWorker worker; <br>&nbsp; &nbsp; &nbsp;private final NioSocketChannelConfig config; <br>+ &nbsp; &nbsp;private volatile InetSocketAddress localAddress; <br>+ &nbsp; &nbsp;private volatile InetSocketAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;final Object interestOpsLock = new Object(); <br>&nbsp; &nbsp; &nbsp;final Object writeLock = new Object(); <br>@@ -86,21 +88,31 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getLocalAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.socket().getLocalSocketAddress(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress localAddress = this.localAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (localAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.localAddress = localAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) socket.socket().getLocalSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return localAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;try { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.socket().getRemoteSocketAddress(); <br>- &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress remoteAddress = this.remoteAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) socket.socket().getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return remoteAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java 2009-06-23 07:20:57 UTC (rev 1489) <br>+++ trunk/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java 2009-06-23 07:46:59 UTC (rev 1490) <br>@@ -53,6 +53,8 @@ <br>&nbsp; &nbsp; &nbsp;final Object interestOpsLock = new Object(); <br>&nbsp; &nbsp; &nbsp;private final SocketChannelConfig config; <br>&nbsp; &nbsp; &nbsp;volatile Thread workerThread; <br>+ &nbsp; &nbsp;private volatile InetSocketAddress localAddress; <br>+ &nbsp; &nbsp;private volatile InetSocketAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;OioSocketChannel( <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;Channel parent, <br>@@ -72,11 +74,31 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getLocalAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.getLocalSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress localAddress = this.localAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (localAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.localAddress = localAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) socket.getLocalSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return localAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public InetSocketAddress getRemoteAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;return (InetSocketAddress) socket.getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;InetSocketAddress remoteAddress = this.remoteAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;try { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(InetSocketAddress) socket.getRemoteSocketAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} catch (Throwable t) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;// Sometimes fails on a closed socket in Windows. <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return remoteAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java 2009-06-23 07:20:57 UTC (rev 1489) <br>+++ trunk/src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java 2009-06-23 07:46:59 UTC (rev 1490) <br>@@ -55,6 +55,8 @@ <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;private final XnioChannelConfig config; <br>&nbsp; &nbsp; &nbsp;volatile java.nio.channels.Channel xnioChannel; <br>+ &nbsp; &nbsp;private volatile SocketAddress localAddress; <br>+ &nbsp; &nbsp;private volatile SocketAddress remoteAddress; <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;final Object writeLock = new Object(); <br>&nbsp; &nbsp; &nbsp;final Queue&lt;MessageEvent&gt; writeBuffer = new WriteBuffer(); <br>@@ -76,21 +78,31 @@ <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public SocketAddress getLocalAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;java.nio.channels.Channel xnioChannel = this.xnioChannel; <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (!isOpen() || !(xnioChannel instanceof BoundChannel)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress localAddress = this.localAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (localAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;java.nio.channels.Channel xnioChannel = this.xnioChannel; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!isOpen() || !(xnioChannel instanceof BoundChannel)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.localAddress = localAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(SocketAddress) ((BoundChannel) xnioChannel).getLocalAddress(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;return (SocketAddress) ((BoundChannel) xnioChannel).getLocalAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return localAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public SocketAddress getRemoteAddress() { <br>- &nbsp; &nbsp; &nbsp; &nbsp;java.nio.channels.Channel xnioChannel = this.xnioChannel; <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (!isOpen() || !(xnioChannel instanceof ConnectedChannel)) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress remoteAddress = this.remoteAddress; <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress == null) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;java.nio.channels.Channel xnioChannel = this.xnioChannel; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!isOpen() || !(xnioChannel instanceof ConnectedChannel)) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return null; <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>+ <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;this.remoteAddress = remoteAddress = <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(SocketAddress) ((ConnectedChannel) xnioChannel).getPeerAddress(); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- <br>- &nbsp; &nbsp; &nbsp; &nbsp;return (SocketAddress) ((ConnectedChannel) xnioChannel).getPeerAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;return remoteAddress; <br>&nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp;public boolean isBound() { <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3140956&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3140862 2009-06-23T00:20:58Z 2009-06-23T00:20:58Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-23 03:20:57 -0400 (Tue, 23 Jun 2009) <br>New Revision: 1489 <br><br>Modified: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/channel/AbstractChannel.java <br>Log: <br>Related issue: NETTY-180 Channel.getRemoteAddress() can return null for a received MessageEvent when ExecutionHandler is in the pipeline. <br>* AbstractChannel.toString() does not use isConnected() or isBound() because it can lead to inconsistent string representation when ExecutionHandler is in the pipeline. <br><br>Modified: trunk/src/main/java/org/jboss/netty/channel/AbstractChannel.java <br>=================================================================== <br>--- trunk/src/main/java/org/jboss/netty/channel/AbstractChannel.java 2009-06-22 09:33:18 UTC (rev 1488) <br>+++ trunk/src/main/java/org/jboss/netty/channel/AbstractChannel.java 2009-06-23 07:20:57 UTC (rev 1489) <br>@@ -257,20 +257,22 @@ <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(&quot;[id: 0x&quot;); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(getIdString()); <br>&nbsp; <br>- &nbsp; &nbsp; &nbsp; &nbsp;if (connected) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress localAddress = getLocalAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;SocketAddress remoteAddress = getRemoteAddress(); <br>+ &nbsp; &nbsp; &nbsp; &nbsp;if (remoteAddress != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(&quot;, &quot;); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (getParent() == null) { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(localAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(&quot; =&gt; &quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(getRemoteAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(remoteAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} else { <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(getRemoteAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(remoteAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(&quot; =&gt; &quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(localAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>- &nbsp; &nbsp; &nbsp; &nbsp;} else if (isBound()) { <br>+ &nbsp; &nbsp; &nbsp; &nbsp;} else if (localAddress != null) { <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(&quot;, &quot;); <br>- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(getLocalAddress()); <br>+ &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(localAddress); <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;} <br>&nbsp; <br>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;buf.append(']'); <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3140862&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3140098 2009-06-22T02:33:18Z 2009-06-22T02:33:18Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-22 05:33:18 -0400 (Mon, 22 Jun 2009) <br>New Revision: 1488 <br><br>Removed: <br>&nbsp; &nbsp;trunk/src/main/java/org/jboss/netty/example/servlet/ <br>Log: <br>Removed an empty directory <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3140098&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br> tag:n2.nabble.com,2006:post-3121248 2009-06-19T11:11:32Z 2009-06-19T11:11:32Z Netty Commit Logs mailing list Author: trustin <br>Date: 2009-06-19 14:11:32 -0400 (Fri, 19 Jun 2009) <br>New Revision: 1487 <br><br>Modified: <br>&nbsp; &nbsp;trunk/pom.xml <br>Log: <br>[maven-release-plugin] prepare for next development iteration <br><br>Modified: trunk/pom.xml <br>=================================================================== <br>--- trunk/pom.xml 2009-06-19 18:11:27 UTC (rev 1486) <br>+++ trunk/pom.xml 2009-06-19 18:11:32 UTC (rev 1487) <br>@@ -26,7 +26,7 @@ <br>&nbsp; &nbsp;&lt;groupId&gt;org.jboss.netty&lt;/groupId&gt; <br>&nbsp; &nbsp;&lt;artifactId&gt;netty&lt;/artifactId&gt; <br>&nbsp; &nbsp;&lt;packaging&gt;bundle&lt;/packaging&gt; <br>- &nbsp;&lt;version&gt;3.1.0.CR1&lt;/version&gt; <br>+ &nbsp;&lt;version&gt;3.1.0.CR2-SNAPSHOT&lt;/version&gt; <br>&nbsp; <br>&nbsp; &nbsp;&lt;name&gt;The Netty Project&lt;/name&gt; <br>&nbsp; &nbsp;&lt;url&gt;<a href="http://www.jboss.org/netty/" target="_top" rel="nofollow">http://www.jboss.org/netty/</a>&lt;/url&gt; <br>@@ -53,8 +53,8 @@ <br>&nbsp; &nbsp;&lt;inceptionYear&gt;2008&lt;/inceptionYear&gt; <br>&nbsp; <br>&nbsp; &nbsp;&lt;scm&gt; <br>- &nbsp; &nbsp;&lt;connection&gt;scm:svn:<a href="http://anonsvn.jboss.org/repos/netty/tags/netty-3.1.0.CR1" target="_top" rel="nofollow">http://anonsvn.jboss.org/repos/netty/tags/netty-3.1.0.CR1</a>&lt;/connection&gt; <br>- &nbsp; &nbsp;&lt;developerConnection&gt;scm:svn:<a href="https://svn.jboss.org/repos/netty/tags/netty-3.1.0.CR1" target="_top" rel="nofollow">https://svn.jboss.org/repos/netty/tags/netty-3.1.0.CR1</a>&lt;/developerConnection&gt; <br>+ &nbsp; &nbsp;&lt;connection&gt;scm:svn:<a href="http://anonsvn.jboss.org/repos/netty/trunk" target="_top" rel="nofollow">http://anonsvn.jboss.org/repos/netty/trunk</a>&lt;/connection&gt; <br>+ &nbsp; &nbsp;&lt;developerConnection&gt;scm:svn:<a href="https://svn.jboss.org/repos/netty/trunk" target="_top" rel="nofollow">https://svn.jboss.org/repos/netty/trunk</a>&lt;/developerConnection&gt; <br>&nbsp; &nbsp;&lt;/scm&gt; <br>&nbsp; <br>&nbsp; &nbsp;&lt;dependencies&gt; <br><br>_______________________________________________ <br>netty-commits mailing list <br><a href="http://n2.nabble.com/user/SendEmail.jtp?type=node&node=3121248&i=0" target="_top" rel="nofollow">netty-commits@...</a> <br><a href="https://lists.jboss.org/mailman/listinfo/netty-commits" target="_top" rel="nofollow">https://lists.jboss.org/mailman/listinfo/netty-commits</a><br>