Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge compile errors

This commit is contained in:
Greg Wilkins 2016-03-17 06:49:14 +11:00
parent d287f6e6e0
commit 46abbba566
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
View File

@ -107,7 +107,6 @@ public abstract class AbstractHttpTest
"it should contain connection:close", response.getHeaders().get("connection"), is("close")); "it should contain connection:close", response.getHeaders().get("connection"), is("close"));
return response; return response;
} }
}
} }
protected void assertResponseBody(SimpleHttpResponse response, String expectedResponseBody) protected void assertResponseBody(SimpleHttpResponse response, String expectedResponseBody)

7
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
View File

@ -264,10 +264,6 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
String response = readResponse(client); String response = readResponse(client);
assertThat(response,Matchers.containsString(" 500 ")); assertThat(response,Matchers.containsString(" 500 "));
} }
finally
{
((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(false);
}
} }
@Test @Test
@ -288,9 +284,8 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture
Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort());
OutputStream os = client.getOutputStream(); OutputStream os = client.getOutputStream();
try try (StacklessLogging stackless = new StacklessLogging(HttpChannel.class))
{ {
((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true);
Log.getLogger(HttpChannel.class).info("Expecting ServletException: TEST handler exception..."); Log.getLogger(HttpChannel.class).info("Expecting ServletException: TEST handler exception...");
os.write(request.toString().getBytes()); os.write(request.toString().getBytes());
os.flush(); os.flush();

1
tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
View File

@ -53,7 +53,6 @@ public class ReloadedSessionMissingClassTest
@Test @Test
public void testSessionReloadWithMissingClass() throws Exception public void testSessionReloadWithMissingClass() throws Exception
{ {
((StdErrLog)Log.getLogger(org.eclipse.jetty.server.session.JDBCSessionManager.class)).setHideStacks(true);
Resource.setDefaultUseCaches(false); Resource.setDefaultUseCaches(false);
String contextPath = "/foo"; String contextPath = "/foo";

6
tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractIdleSessionTest.java
View File

@ -39,6 +39,7 @@ import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.StacklessLogging; import org.eclipse.jetty.util.log.StacklessLogging;
import org.eclipse.jetty.util.thread.Locker.Lock; import org.eclipse.jetty.util.thread.Locker.Lock;
import org.junit.Test; import org.junit.Test;
@ -118,7 +119,6 @@ public abstract class AbstractIdleSessionTest
int scavengePeriod = 3; int scavengePeriod = 3;
int idlePeriod = 5; int idlePeriod = 5;
int inspectPeriod = 1; int inspectPeriod = 1;
((StdErrLog)Log.getLogger("org.eclipse.jetty.server.session")).setHideStacks(true);
_server1 = createServer(0, inactivePeriod, scavengePeriod, inspectPeriod, idlePeriod); _server1 = createServer(0, inactivePeriod, scavengePeriod, inspectPeriod, idlePeriod);
@ -128,8 +128,8 @@ public abstract class AbstractIdleSessionTest
_server1.start(); _server1.start();
int port1 = _server1.getPort(); int port1 = _server1.getPort();
try (StacklessLogging stackless = new StacklessLogging(HashedSession.class)) try (StacklessLogging stackless = new StacklessLogging(Log.getLogger("org.eclipse.jetty.server.session")))
{ {
HttpClient client = new HttpClient(); HttpClient client = new HttpClient();
client.start(); client.start();
String url = "http://localhost:" + port1 + contextPath + servletMapping; String url = "http://localhost:" + port1 + contextPath + servletMapping;