From 4b0193247b100fd6fdeb4ff346de4808ea566927 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 30 Oct 2014 15:50:54 +1100 Subject: [PATCH 1/2] 448841 Clarified selectors==0 javadoc 448840 Clarified ServerConnector javadoc 448839 Fixed javadoc typo in ServerConnector --- .../org/eclipse/jetty/server/AbstractConnector.java | 2 +- .../java/org/eclipse/jetty/server/ServerConnector.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java index 860799442fb..7a78545ab35 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java @@ -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 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 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. */ public AbstractConnector( diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java index 32b41f86039..f22ba5fb37e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java @@ -104,7 +104,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 selector threads are used to accept connections. * @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( @Name("server") Server server, @@ -122,7 +122,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 selector threads are used to accept connections. * @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. */ public ServerConnector( @@ -171,7 +171,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 selector threads are used to accept connections. * @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( @Name("server") Server server, @@ -201,7 +201,7 @@ public class ServerConnector extends AbstractNetworkConnector * @param server * The server this connector will be accept connection for. * @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 * @param scheduler * A scheduler used to schedule timeouts. If null then use the servers scheduler @@ -211,7 +211,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 selector threads are used to accept connections. * @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. */ From 2332b4f73406226ae149850e8d2d19422737dc00 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 30 Oct 2014 16:42:31 +1100 Subject: [PATCH 2/2] 449175 Removed extra space in NCSA log --- .../java/org/eclipse/jetty/server/AbstractNCSARequestLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java index 2a16bdd5501..b52fab8f8bc 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java @@ -120,7 +120,7 @@ public abstract class AbstractNCSARequestLog extends AbstractLifeCycle implement if (authentication instanceof Authentication.User) buf.append(((Authentication.User)authentication).getUserIdentity().getUserPrincipal().getName()); else - buf.append(" - "); + buf.append("-"); buf.append(" ["); if (_logDateCache != null)