From 1ae53127777ee7da5fafe466658c443b25219ebb Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Mon, 25 Aug 2008 13:02:02 +0000 Subject: [PATCH] Fixed compilation errors in JDK 1.6 and 1.5 - was using 1.7 :-( --- src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java | 3 --- .../java/org/jboss/netty/bootstrap/ClientBootstrapTest.java | 6 +++--- .../java/org/jboss/netty/bootstrap/ServerBootstrapTest.java | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java index 29dd2adc99..06d7e9cb57 100644 --- a/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java @@ -31,8 +31,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.NoSuchElementException; import java.util.Map.Entry; -import java.util.logging.Level; -import java.util.logging.Logger; import org.jboss.netty.channel.ChannelDownstreamHandler; import org.jboss.netty.channel.ChannelFactory; @@ -174,7 +172,6 @@ public class BootstrapTest { @Test public void shouldHaveOrderedPipelineWhenSetFromMap() { - Logger.getGlobal().setLevel(Level.SEVERE); Map m = new LinkedHashMap(); m.put("a", createMock(ChannelDownstreamHandler.class)); m.put("b", createMock(ChannelDownstreamHandler.class)); diff --git a/src/test/java/org/jboss/netty/bootstrap/ClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/ClientBootstrapTest.java index 221b7d4b75..368c8d4e9f 100644 --- a/src/test/java/org/jboss/netty/bootstrap/ClientBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/ClientBootstrapTest.java @@ -98,7 +98,7 @@ public class ClientBootstrapTest { bootstrap.setOption( "remoteAddress", new InetSocketAddress( - InetAddress.getLoopbackAddress(), + InetAddress.getLocalHost(), serverSocket.socket().getLocalPort())); ChannelFuture future = bootstrap.connect(); @@ -129,7 +129,7 @@ public class ClientBootstrapTest { bootstrap.setOption( "remoteAddress", new InetSocketAddress( - InetAddress.getLoopbackAddress(), + InetAddress.getLocalHost(), serverSocket.socket().getLocalPort())); bootstrap.setOption("localAddress", new InetSocketAddress(0)); @@ -157,7 +157,7 @@ public class ClientBootstrapTest { expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException()); replay(pipelineFactory); - bootstrap.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), 1)); + bootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 1)); } @Test(expected = IllegalStateException.class) diff --git a/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java index 75ed7049b5..4921a8db6e 100644 --- a/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/ServerBootstrapTest.java @@ -104,7 +104,7 @@ public class ServerBootstrapTest { Socket socket = null; try { socket = new Socket( - InetAddress.getLoopbackAddress(), + InetAddress.getLocalHost(), ((InetSocketAddress) channel.getLocalAddress()).getPort()); // Wait until the connection is open in the server side. @@ -158,7 +158,7 @@ public class ServerBootstrapTest { expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException()); replay(pipelineFactory); - bootstrap.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), 1)); + bootstrap.connect(new InetSocketAddress(InetAddress.getLocalHost(), 1)); } @Test(expected = IllegalStateException.class)