This commit is contained in:
Greg Wilkins 2016-11-10 13:56:33 +11:00
parent 1eb4e3b4e3
commit fe1704c89a
3 changed files with 2 additions and 4 deletions

View File

@ -331,7 +331,7 @@ public class ByteArrayEndPoint extends AbstractEndPoint
* @param time Time to wait * @param time Time to wait
* @param unit Units for time to wait * @param unit Units for time to wait
* @return The buffer of output * @return The buffer of output
* @throws InterruptedException * @throws InterruptedException if interrupted
*/ */
public ByteBuffer waitForOutput(long time,TimeUnit unit) throws InterruptedException public ByteBuffer waitForOutput(long time,TimeUnit unit) throws InterruptedException
{ {

View File

@ -44,14 +44,13 @@ import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.Invocable.InvocationType;
/** /**
* A Connection that acts as an interceptor between an EndPoint providing SSL encrypted data * A Connection that acts as an interceptor between an EndPoint providing SSL encrypted data
* and another consumer of an EndPoint (typically an {@link Connection} like HttpConnection) that * and another consumer of an EndPoint (typically an {@link Connection} like HttpConnection) that
* wants unencrypted data. * wants unencrypted data.
* <p> * <p>
* The connector uses an {@link EndPoint} (typically {@link SelectChannelEndPoint}) as * The connector uses an {@link EndPoint} (typically SocketChannelEndPoint) as
* it's source/sink of encrypted data. It then provides an endpoint via {@link #getDecryptedEndPoint()} to * it's source/sink of encrypted data. It then provides an endpoint via {@link #getDecryptedEndPoint()} to
* expose a source/sink of unencrypted data to another connection (eg HttpConnection). * expose a source/sink of unencrypted data to another connection (eg HttpConnection).
* <p> * <p>

View File

@ -1602,7 +1602,6 @@ public class SslContextFactory extends AbstractLifeCycle
* <p> * <p>
* This is based on the information on effective key lengths in RFC 2246 - The TLS Protocol * This is based on the information on effective key lengths in RFC 2246 - The TLS Protocol
* Version 1.0, Appendix C. CipherSuite definitions: * Version 1.0, Appendix C. CipherSuite definitions:
* <p>
* <pre> * <pre>
* Effective * Effective
* Cipher Type Key Bits * Cipher Type Key Bits