Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2010-12-01 17:30:31 +0000
committerGreg Wilkins2010-12-01 17:30:31 +0000
commit1c70bb6e45bea05383ae3e2640209279823a2e6b (patch)
tree774346c8ad1441dd9aae0a3404b2d5e18535c64f
parent26cc7563f573f10dbf4170c7a37870487e1c3943 (diff)
downloadorg.eclipse.jetty.project-1c70bb6e45bea05383ae3e2640209279823a2e6b.tar.gz
org.eclipse.jetty.project-1c70bb6e45bea05383ae3e2640209279823a2e6b.tar.xz
org.eclipse.jetty.project-1c70bb6e45bea05383ae3e2640209279823a2e6b.zip
331567 IPAccessHandlerTest failed on MacOS fix
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2566 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt2
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 62340799a9..3466aebd0f 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,4 @@
-
+ + 331567 IPAccessHandlerTest failed on MacOS fix
+ 328789 Clean up tmp files from test harnesses
+ 331230 Fixed low thread warnings when acceptors>threadpool
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java
index 6ac5e7969f..f6adcd6b83 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/IPAccessHandlerTest.java
@@ -38,7 +38,6 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.bio.SocketConnector;
-import org.eclipse.jetty.util.log.Log;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -107,7 +106,7 @@ public class IPAccessHandlerTest
_handler.setBlack(_black.split(";",-1));
String request = "GET " + _uri + " HTTP/1.1\n" + "Host: "+ _host + "\n\n";
- Socket socket = new Socket("localhost", _connector.getLocalPort());
+ Socket socket = new Socket("127.0.0.1", _connector.getLocalPort());
socket.setSoTimeout(5000);
try
{

Back to the top