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

Code cleanups. 

Removed unnecessary imports and fixed typos.
This commit is contained in:
Simone Bordet 2017-10-02 11:43:45 +02:00
parent 4526006bde
commit 17a1484143
6 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
View File

@ -32,7 +32,6 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
/** /**
* A Jetty server with multiple connectors. * A Jetty server with multiple connectors.

1
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -73,7 +73,6 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler; import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.util.thread.ThreadBudget;
import org.eclipse.jetty.util.thread.ThreadPool; import org.eclipse.jetty.util.thread.ThreadPool;
/** /**

1
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
View File

@ -70,7 +70,6 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dump
int cpus = Runtime.getRuntime().availableProcessors(); int cpus = Runtime.getRuntime().availableProcessors();
return Math.max(1,Math.min(cpus/2,threads/16)); return Math.max(1,Math.min(cpus/2,threads/16));
} }
return Math.max(1,Runtime.getRuntime().availableProcessors()/2); return Math.max(1,Runtime.getRuntime().availableProcessors()/2);
} }

3
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

@ -24,7 +24,6 @@ import java.net.InetSocketAddress;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.Enumeration; import java.util.Enumeration;
@ -66,9 +65,7 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.Locker; import org.eclipse.jetty.util.thread.Locker;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ShutdownThread;
import org.eclipse.jetty.util.thread.ThreadBudget;
import org.eclipse.jetty.util.thread.ThreadPool; import org.eclipse.jetty.util.thread.ThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool.SizedThreadPool;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** Jetty HTTP Servlet Server. /** Jetty HTTP Servlet Server.

9
jetty-server/src/test/java/org/eclipse/jetty/server/InsufficientThreadsDetectionTest.java
View File

@ -82,8 +82,6 @@ public class InsufficientThreadsDetectionTest
_server.start(); _server.start();
} }
// Github issue #586
@Test @Test
public void testCaseForMultipleConnectors() throws Exception public void testCaseForMultipleConnectors() throws Exception
{ {
@ -95,14 +93,14 @@ public class InsufficientThreadsDetectionTest
// first connector consumes 3 threads from server pool // first connector consumes 3 threads from server pool
_server.addConnector(new ServerConnector(_server, null, null, null, 1, 1, new HttpConnectionFactory())); _server.addConnector(new ServerConnector(_server, null, null, null, 1, 1, new HttpConnectionFactory()));
// second connect also require 4 threads but uses own executor, so its threads should not be counted // second connect also require 3 threads but uses own executor, so its threads should not be counted
final QueuedThreadPool connectorPool = new QueuedThreadPool(4, 4); final QueuedThreadPool connectorPool = new QueuedThreadPool(4, 4);
_server.addConnector(new ServerConnector(_server, connectorPool, null, null, 1, 1, new HttpConnectionFactory())); _server.addConnector(new ServerConnector(_server, connectorPool, null, null, 1, 1, new HttpConnectionFactory()));
// first connector consumes 3 threads from server pool // third connector consumes 3 threads from server pool
_server.addConnector(new ServerConnector(_server, null, null, null, 1, 1, new HttpConnectionFactory())); _server.addConnector(new ServerConnector(_server, null, null, null, 1, 1, new HttpConnectionFactory()));
// should not throw exception because limit was not overflown // should throw exception because limit was overflown
_server.start(); _server.start();
Assert.fail(); Assert.fail();
@ -112,5 +110,4 @@ public class InsufficientThreadsDetectionTest
Log.getLogger(ThreadBudget.class).warn(e.toString()); Log.getLogger(ThreadBudget.class).warn(e.toString());
} }
} }
} }

4
jetty-util/src/main/java/org/eclipse/jetty/util/component/Container.java
View File

@ -18,11 +18,7 @@
package org.eclipse.jetty.util.component; package org.eclipse.jetty.util.component;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
/** /**
* A Container * A Container