[jboss-cvs] JBoss Messaging SVN: r7571 - trunk/src/main/org/jboss/messaging/integration/transports/netty.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-07-15 06:31:37 -0400 (Wed, 15 Jul 2009)
New Revision: 7571

Modified:
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java
Log:
fixed NettyConnector to compile with latest Netty 3.1.0.CR2-SNAPSHOT

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java	2009-07-15 09:36:55 UTC (rev 7570)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java	2009-07-15 10:31:37 UTC (rev 7571)
@@ -64,7 +64,6 @@
 import org.jboss.netty.channel.group.ChannelGroup;
 import org.jboss.netty.channel.group.DefaultChannelGroup;
 import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.http.HttpTunnelAddress;
 import org.jboss.netty.channel.socket.http.HttpTunnelingClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
@@ -348,23 +347,23 @@
       {
          return null;
       }
+
       SocketAddress address;
       if (useServlet)
       {
          try
          {
             URI uri = new URI("http", null, host, port, servletPath, null, null);
-            address = new HttpTunnelAddress(uri);
+            bootstrap.setOption("serverName", uri.getHost());
+            bootstrap.setOption("serverPath", uri.getRawPath());
          }
          catch (URISyntaxException e)
          {
             throw new IllegalArgumentException(e.getMessage());
          }
       }
-      else
-      {
-         address = new InetSocketAddress(host, port);
-      }
+      address = new InetSocketAddress(host, port);
+      
       ChannelFuture future = bootstrap.connect(address);
       future.awaitUninterruptibly();