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

Merge remote-tracking branch 'origin/jetty-9.2.x'

This commit is contained in:
Greg Wilkins 2014-10-30 16:58:55 +11:00
parent a6e00bc642 2332b4f734
commit 71d1c434e4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -155,7 +155,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
* @param executor An executor for this connector or null to use the servers executor * @param executor An executor for this connector or null to use the servers executor
* @param scheduler A scheduler for this connector or null to either a {@link Scheduler} set as a server bean or if none set, then a new {@link ScheduledExecutorScheduler} instance. * @param scheduler A scheduler for this connector or null to either a {@link Scheduler} set as a server bean or if none set, then a new {@link ScheduledExecutorScheduler} instance.
* @param pool A buffer pool for this connector or null to either a {@link ByteBufferPool} set as a server bean or none set, the new {@link ArrayByteBufferPool} instance. * @param pool A buffer pool for this connector or null to either a {@link ByteBufferPool} set as a server bean or none set, the new {@link ArrayByteBufferPool} instance.
* @param acceptors the number of acceptor threads to use, or 0 for a default value. * @param acceptors the number of acceptor threads to use, or -1 for a default value. If 0, then no acceptor threads will be launched and some other mechanism will need to be used to accept new connections.
* @param factories The Connection Factories to use. * @param factories The Connection Factories to use.
*/ */
public AbstractConnector( public AbstractConnector(

2
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java
View File

@ -120,7 +120,7 @@ public abstract class AbstractNCSARequestLog extends AbstractLifeCycle implement
if (authentication instanceof Authentication.User) if (authentication instanceof Authentication.User)
buf.append(((Authentication.User)authentication).getUserIdentity().getUserPrincipal().getName()); buf.append(((Authentication.User)authentication).getUserIdentity().getUserPrincipal().getName());
else else
buf.append(" - "); buf.append("-");
buf.append(" ["); buf.append(" [");
if (_logDateCache != null) if (_logDateCache != null)

10
jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java
View File

@ -107,7 +107,7 @@ public class ServerConnector extends AbstractNetworkConnector
* the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then * the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then
* the selector threads are used to accept connections. * the selector threads are used to accept connections.
* @param selectors * @param selectors
* the number of selector threads, or -1 for a default value. Selectors notice and schedule established connection that can make IO progress. * the number of selector threads, or <=0 for a default value. Selectors notice and schedule established connection that can make IO progress.
*/ */
public ServerConnector( public ServerConnector(
@Name("server") Server server, @Name("server") Server server,
@ -125,7 +125,7 @@ public class ServerConnector extends AbstractNetworkConnector
* the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then * the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then
* the selector threads are used to accept connections. * the selector threads are used to accept connections.
* @param selectors * @param selectors
* the number of selector threads, or -1 for a default value. Selectors notice and schedule established connection that can make IO progress. * the number of selector threads, or <=0 for a default value. Selectors notice and schedule established connection that can make IO progress.
* @param factories Zero or more {@link ConnectionFactory} instances used to create and configure connections. * @param factories Zero or more {@link ConnectionFactory} instances used to create and configure connections.
*/ */
public ServerConnector( public ServerConnector(
@ -174,7 +174,7 @@ public class ServerConnector extends AbstractNetworkConnector
* the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then * the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then
* the selector threads are used to accept connections. * the selector threads are used to accept connections.
* @param selectors * @param selectors
* the number of selector threads, or -1 for a default value. Selectors notice and schedule established connection that can make IO progress. * the number of selector threads, or <=0 for a default value. Selectors notice and schedule established connection that can make IO progress.
*/ */
public ServerConnector( public ServerConnector(
@Name("server") Server server, @Name("server") Server server,
@ -204,7 +204,7 @@ public class ServerConnector extends AbstractNetworkConnector
* @param server * @param server
* The server this connector will be accept connection for. * The server this connector will be accept connection for.
* @param executor * @param executor
* An executor used to run tasks for handling requests, acceptors and selectors. I * An executor used to run tasks for handling requests, acceptors and selectors.
* If null then use the servers executor * If null then use the servers executor
* @param scheduler * @param scheduler
* A scheduler used to schedule timeouts. If null then use the servers scheduler * A scheduler used to schedule timeouts. If null then use the servers scheduler
@ -214,7 +214,7 @@ public class ServerConnector extends AbstractNetworkConnector
* the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then * the number of acceptor threads to use, or -1 for a default value. Acceptors accept new TCP/IP connections. If 0, then
* the selector threads are used to accept connections. * the selector threads are used to accept connections.
* @param selectors * @param selectors
* the number of selector threads, or -1 for a default value. Selectors notice and schedule established connection that can make IO progress. * the number of selector threads, or <=0 for a default value. Selectors notice and schedule established connection that can make IO progress.
* @param factories * @param factories
* Zero or more {@link ConnectionFactory} instances used to create and configure connections. * Zero or more {@link ConnectionFactory} instances used to create and configure connections.
*/ */