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

Post-Merge Build/Test fixes

This commit is contained in:
Joakim Erdfelt 2018-01-08 15:38:23 -06:00
parent b2ff7c5cb8
commit 34375a7e0e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
View File

@ -21,6 +21,7 @@ package org.eclipse.jetty.websocket.common.io;
import java.io.EOFException;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;

5
jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/MemoryUsageTest.java
View File

@ -18,7 +18,9 @@
package org.eclipse.jetty.websocket.tests.server.jsr356;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assume.assumeThat;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
@ -38,6 +40,7 @@ import javax.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.toolchain.test.JDK;
import org.eclipse.jetty.websocket.jsr356.server.ServerContainer;
import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
import org.junit.After;
@ -97,6 +100,8 @@ public class MemoryUsageTest
@Test
public void testMemoryUsage() throws Exception
{
assumeThat("Only run on JDK 8 and older", JDK.IS_9, is(false));
int sessionCount = 1000;
Session[] sessions = new Session[sessionCount];