Fix minor spelling issues in javadocs (#8701)
Motivation: Javadocs contained some spelling errors, we should fix these. Modification: Fix spelling Result: Javadoc cleanup.
This commit is contained in:
parent
ef5b454a00
commit
c0aa1ea5c7
@ -158,8 +158,8 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
||||||
* If you need to have it increased use {@link #addComponent(boolean, ByteBuf)}.
|
* If you need to have it increased use {@link #addComponent(boolean, ByteBuf)}.
|
||||||
* <p>
|
* <p>
|
||||||
* {@link ByteBuf#release()} ownership of {@code buffer} is transfered to this {@link CompositeByteBuf}.
|
* {@link ByteBuf#release()} ownership of {@code buffer} is transferred to this {@link CompositeByteBuf}.
|
||||||
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transfered to this
|
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponent(ByteBuf buffer) {
|
public CompositeByteBuf addComponent(ByteBuf buffer) {
|
||||||
@ -172,10 +172,10 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
||||||
* If you need to have it increased use {@link #addComponents(boolean, ByteBuf[])}.
|
* If you need to have it increased use {@link #addComponents(boolean, ByteBuf[])}.
|
||||||
* <p>
|
* <p>
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
||||||
* ownership of all {@link ByteBuf} objects is transfered to this {@link CompositeByteBuf}.
|
* ownership of all {@link ByteBuf} objects is transferred to this {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponents(ByteBuf... buffers) {
|
public CompositeByteBuf addComponents(ByteBuf... buffers) {
|
||||||
return addComponents(false, buffers);
|
return addComponents(false, buffers);
|
||||||
@ -187,10 +187,10 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
||||||
* If you need to have it increased use {@link #addComponents(boolean, Iterable)}.
|
* If you need to have it increased use {@link #addComponents(boolean, Iterable)}.
|
||||||
* <p>
|
* <p>
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
||||||
* ownership of all {@link ByteBuf} objects is transfered to this {@link CompositeByteBuf}.
|
* ownership of all {@link ByteBuf} objects is transferred to this {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponents(Iterable<ByteBuf> buffers) {
|
public CompositeByteBuf addComponents(Iterable<ByteBuf> buffers) {
|
||||||
return addComponents(false, buffers);
|
return addComponents(false, buffers);
|
||||||
@ -202,9 +202,9 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
||||||
* If you need to have it increased use {@link #addComponent(boolean, int, ByteBuf)}.
|
* If you need to have it increased use {@link #addComponent(boolean, int, ByteBuf)}.
|
||||||
* <p>
|
* <p>
|
||||||
* {@link ByteBuf#release()} ownership of {@code buffer} is transfered to this {@link CompositeByteBuf}.
|
* {@link ByteBuf#release()} ownership of {@code buffer} is transferred to this {@link CompositeByteBuf}.
|
||||||
* @param cIndex the index on which the {@link ByteBuf} will be added.
|
* @param cIndex the index on which the {@link ByteBuf} will be added.
|
||||||
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transfered to this
|
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponent(int cIndex, ByteBuf buffer) {
|
public CompositeByteBuf addComponent(int cIndex, ByteBuf buffer) {
|
||||||
@ -215,8 +215,8 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Add the given {@link ByteBuf} and increase the {@code writerIndex} if {@code increaseWriterIndex} is
|
* Add the given {@link ByteBuf} and increase the {@code writerIndex} if {@code increaseWriterIndex} is
|
||||||
* {@code true}.
|
* {@code true}.
|
||||||
*
|
*
|
||||||
* {@link ByteBuf#release()} ownership of {@code buffer} is transfered to this {@link CompositeByteBuf}.
|
* {@link ByteBuf#release()} ownership of {@code buffer} is transferred to this {@link CompositeByteBuf}.
|
||||||
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transfered to this
|
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponent(boolean increaseWriterIndex, ByteBuf buffer) {
|
public CompositeByteBuf addComponent(boolean increaseWriterIndex, ByteBuf buffer) {
|
||||||
@ -230,10 +230,10 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Add the given {@link ByteBuf}s and increase the {@code writerIndex} if {@code increaseWriterIndex} is
|
* Add the given {@link ByteBuf}s and increase the {@code writerIndex} if {@code increaseWriterIndex} is
|
||||||
* {@code true}.
|
* {@code true}.
|
||||||
*
|
*
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
||||||
* ownership of all {@link ByteBuf} objects is transfered to this {@link CompositeByteBuf}.
|
* ownership of all {@link ByteBuf} objects is transferred to this {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponents(boolean increaseWriterIndex, ByteBuf... buffers) {
|
public CompositeByteBuf addComponents(boolean increaseWriterIndex, ByteBuf... buffers) {
|
||||||
checkNotNull(buffers, "buffers");
|
checkNotNull(buffers, "buffers");
|
||||||
@ -246,10 +246,10 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Add the given {@link ByteBuf}s and increase the {@code writerIndex} if {@code increaseWriterIndex} is
|
* Add the given {@link ByteBuf}s and increase the {@code writerIndex} if {@code increaseWriterIndex} is
|
||||||
* {@code true}.
|
* {@code true}.
|
||||||
*
|
*
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
||||||
* ownership of all {@link ByteBuf} objects is transfered to this {@link CompositeByteBuf}.
|
* ownership of all {@link ByteBuf} objects is transferred to this {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponents(boolean increaseWriterIndex, Iterable<ByteBuf> buffers) {
|
public CompositeByteBuf addComponents(boolean increaseWriterIndex, Iterable<ByteBuf> buffers) {
|
||||||
addComponents0(increaseWriterIndex, componentCount, buffers);
|
addComponents0(increaseWriterIndex, componentCount, buffers);
|
||||||
@ -261,9 +261,9 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Add the given {@link ByteBuf} on the specific index and increase the {@code writerIndex}
|
* Add the given {@link ByteBuf} on the specific index and increase the {@code writerIndex}
|
||||||
* if {@code increaseWriterIndex} is {@code true}.
|
* if {@code increaseWriterIndex} is {@code true}.
|
||||||
*
|
*
|
||||||
* {@link ByteBuf#release()} ownership of {@code buffer} is transfered to this {@link CompositeByteBuf}.
|
* {@link ByteBuf#release()} ownership of {@code buffer} is transferred to this {@link CompositeByteBuf}.
|
||||||
* @param cIndex the index on which the {@link ByteBuf} will be added.
|
* @param cIndex the index on which the {@link ByteBuf} will be added.
|
||||||
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transfered to this
|
* @param buffer the {@link ByteBuf} to add. {@link ByteBuf#release()} ownership is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponent(boolean increaseWriterIndex, int cIndex, ByteBuf buffer) {
|
public CompositeByteBuf addComponent(boolean increaseWriterIndex, int cIndex, ByteBuf buffer) {
|
||||||
@ -330,13 +330,13 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
||||||
* If you need to have it increased you need to handle it by your own.
|
* If you need to have it increased you need to handle it by your own.
|
||||||
* <p>
|
* <p>
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param cIndex the index on which the {@link ByteBuf} will be added. {@link ByteBuf#release()} ownership of all
|
* @param cIndex the index on which the {@link ByteBuf} will be added. {@link ByteBuf#release()} ownership of all
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all {@link ByteBuf#release()}
|
||||||
* ownership of all {@link ByteBuf} objects is transfered to this {@link CompositeByteBuf}.
|
* ownership of all {@link ByteBuf} objects is transferred to this {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponents(int cIndex, ByteBuf... buffers) {
|
public CompositeByteBuf addComponents(int cIndex, ByteBuf... buffers) {
|
||||||
checkNotNull(buffers, "buffers");
|
checkNotNull(buffers, "buffers");
|
||||||
@ -405,11 +405,11 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf implements
|
|||||||
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
* Be aware that this method does not increase the {@code writerIndex} of the {@link CompositeByteBuf}.
|
||||||
* If you need to have it increased you need to handle it by your own.
|
* If you need to have it increased you need to handle it by your own.
|
||||||
* <p>
|
* <p>
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects in {@code buffers} is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
* @param cIndex the index on which the {@link ByteBuf} will be added.
|
* @param cIndex the index on which the {@link ByteBuf} will be added.
|
||||||
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all
|
* @param buffers the {@link ByteBuf}s to add. {@link ByteBuf#release()} ownership of all
|
||||||
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects is transfered to this
|
* {@link ByteBuf#release()} ownership of all {@link ByteBuf} objects is transferred to this
|
||||||
* {@link CompositeByteBuf}.
|
* {@link CompositeByteBuf}.
|
||||||
*/
|
*/
|
||||||
public CompositeByteBuf addComponents(int cIndex, Iterable<ByteBuf> buffers) {
|
public CompositeByteBuf addComponents(int cIndex, Iterable<ByteBuf> buffers) {
|
||||||
|
@ -219,7 +219,7 @@ public final class Unpooled {
|
|||||||
* Creates a new buffer which wraps the specified buffer's readable bytes.
|
* Creates a new buffer which wraps the specified buffer's readable bytes.
|
||||||
* A modification on the specified buffer's content will be visible to the
|
* A modification on the specified buffer's content will be visible to the
|
||||||
* returned buffer.
|
* returned buffer.
|
||||||
* @param buffer The buffer to wrap. Reference count ownership of this variable is transfered to this method.
|
* @param buffer The buffer to wrap. Reference count ownership of this variable is transferred to this method.
|
||||||
* @return The readable portion of the {@code buffer}, or an empty buffer if there is no readable portion.
|
* @return The readable portion of the {@code buffer}, or an empty buffer if there is no readable portion.
|
||||||
* The caller is responsible for releasing this buffer.
|
* The caller is responsible for releasing this buffer.
|
||||||
*/
|
*/
|
||||||
@ -245,7 +245,7 @@ public final class Unpooled {
|
|||||||
* Creates a new big-endian composite buffer which wraps the readable bytes of the
|
* Creates a new big-endian composite buffer which wraps the readable bytes of the
|
||||||
* specified buffers without copying them. A modification on the content
|
* specified buffers without copying them. A modification on the content
|
||||||
* of the specified buffers will be visible to the returned buffer.
|
* of the specified buffers will be visible to the returned buffer.
|
||||||
* @param buffers The buffers to wrap. Reference count ownership of all variables is transfered to this method.
|
* @param buffers The buffers to wrap. Reference count ownership of all variables is transferred to this method.
|
||||||
* @return The readable portion of the {@code buffers}. The caller is responsible for releasing this buffer.
|
* @return The readable portion of the {@code buffers}. The caller is responsible for releasing this buffer.
|
||||||
*/
|
*/
|
||||||
public static ByteBuf wrappedBuffer(ByteBuf... buffers) {
|
public static ByteBuf wrappedBuffer(ByteBuf... buffers) {
|
||||||
@ -300,7 +300,7 @@ public final class Unpooled {
|
|||||||
* of the specified buffers will be visible to the returned buffer.
|
* of the specified buffers will be visible to the returned buffer.
|
||||||
* @param maxNumComponents Advisement as to how many independent buffers are allowed to exist before
|
* @param maxNumComponents Advisement as to how many independent buffers are allowed to exist before
|
||||||
* consolidation occurs.
|
* consolidation occurs.
|
||||||
* @param buffers The buffers to wrap. Reference count ownership of all variables is transfered to this method.
|
* @param buffers The buffers to wrap. Reference count ownership of all variables is transferred to this method.
|
||||||
* @return The readable portion of the {@code buffers}. The caller is responsible for releasing this buffer.
|
* @return The readable portion of the {@code buffers}. The caller is responsible for releasing this buffer.
|
||||||
*/
|
*/
|
||||||
public static ByteBuf wrappedBuffer(int maxNumComponents, ByteBuf... buffers) {
|
public static ByteBuf wrappedBuffer(int maxNumComponents, ByteBuf... buffers) {
|
||||||
|
@ -1695,7 +1695,7 @@ public abstract class HttpHeaders implements Iterable<Map.Entry<String, String>>
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a deap copy of the passed in {@link HttpHeaders}.
|
* Returns a deep copy of the passed in {@link HttpHeaders}.
|
||||||
*/
|
*/
|
||||||
public HttpHeaders copy() {
|
public HttpHeaders copy() {
|
||||||
return new DefaultHttpHeaders().set(this);
|
return new DefaultHttpHeaders().set(this);
|
||||||
|
@ -37,7 +37,7 @@ public interface Http2DataFrame extends Http2StreamFrame, ByteBufHolder {
|
|||||||
ByteBuf content();
|
ByteBuf content();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the number of bytes that are flow-controlled initialy, so even if the {@link #content()} is consumed
|
* Returns the number of bytes that are flow-controlled initially, so even if the {@link #content()} is consumed
|
||||||
* this will not change.
|
* this will not change.
|
||||||
*/
|
*/
|
||||||
int initialFlowControlledBytes();
|
int initialFlowControlledBytes();
|
||||||
|
@ -134,7 +134,7 @@ public abstract class ByteToMessageDecoder extends ChannelInboundHandlerAdapter
|
|||||||
return buffer;
|
return buffer;
|
||||||
} finally {
|
} finally {
|
||||||
if (in != null) {
|
if (in != null) {
|
||||||
// We must release if the ownership was not transfered as otherwise it may produce a leak if
|
// We must release if the ownership was not transferred as otherwise it may produce a leak if
|
||||||
// writeBytes(...) throw for whatever release (for example because of OutOfMemoryError).
|
// writeBytes(...) throw for whatever release (for example because of OutOfMemoryError).
|
||||||
in.release();
|
in.release();
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ public final class ClassResolvers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* non-agressive non-concurrent cache
|
* non-aggressive non-concurrent cache
|
||||||
* good for non-shared default cache
|
* good for non-shared default cache
|
||||||
*
|
*
|
||||||
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
||||||
@ -45,7 +45,7 @@ public final class ClassResolvers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* agressive non-concurrent cache
|
* aggressive non-concurrent cache
|
||||||
* good for non-shared cache, when we're not worried about class unloading
|
* good for non-shared cache, when we're not worried about class unloading
|
||||||
*
|
*
|
||||||
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
||||||
@ -58,7 +58,7 @@ public final class ClassResolvers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* non-agressive concurrent cache
|
* non-aggressive concurrent cache
|
||||||
* good for shared cache, when we're worried about class unloading
|
* good for shared cache, when we're worried about class unloading
|
||||||
*
|
*
|
||||||
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
||||||
@ -72,7 +72,7 @@ public final class ClassResolvers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* agressive concurrent cache
|
* aggressive concurrent cache
|
||||||
* good for shared cache, when we're not worried about class unloading
|
* good for shared cache, when we're not worried about class unloading
|
||||||
*
|
*
|
||||||
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
* @param classLoader - specific classLoader to use, or null if you want to revert to default
|
||||||
|
@ -41,7 +41,7 @@ public interface HashingStrategy<T> {
|
|||||||
* This method has the following restrictions:
|
* This method has the following restrictions:
|
||||||
* <ul>
|
* <ul>
|
||||||
* <li><i>reflexive</i> - {@code equals(a, a)} should return true</li>
|
* <li><i>reflexive</i> - {@code equals(a, a)} should return true</li>
|
||||||
* <li><i>symmetric</i> - {@code equals(a, b)} returns {@code true} iff {@code equals(b, a)} returns
|
* <li><i>symmetric</i> - {@code equals(a, b)} returns {@code true} if {@code equals(b, a)} returns
|
||||||
* {@code true}</li>
|
* {@code true}</li>
|
||||||
* <li><i>transitive</i> - if {@code equals(a, b)} returns {@code true} and {@code equals(a, c)} returns
|
* <li><i>transitive</i> - if {@code equals(a, b)} returns {@code true} and {@code equals(a, c)} returns
|
||||||
* {@code true} then {@code equals(b, c)} should also return {@code true}</li>
|
* {@code true} then {@code equals(b, c)} should also return {@code true}</li>
|
||||||
|
@ -1199,7 +1199,7 @@ public class ReferenceCountedOpenSslEngine extends SSLEngine implements Referenc
|
|||||||
// See https://github.com/netty/netty/issues/3900
|
// See https://github.com/netty/netty/issues/3900
|
||||||
if (SSL.bioLengthNonApplication(networkBIO) > 0) {
|
if (SSL.bioLengthNonApplication(networkBIO) > 0) {
|
||||||
if (handshakeException == null && handshakeState != HandshakeState.FINISHED) {
|
if (handshakeException == null && handshakeState != HandshakeState.FINISHED) {
|
||||||
// we seems to have data left that needs to be transfered and so the user needs
|
// we seems to have data left that needs to be transferred and so the user needs
|
||||||
// call wrap(...). Store the error so we can pick it up later.
|
// call wrap(...). Store the error so we can pick it up later.
|
||||||
handshakeException = new SSLHandshakeException(SSL.getErrorString(stackError));
|
handshakeException = new SSLHandshakeException(SSL.getErrorString(stackError));
|
||||||
}
|
}
|
||||||
|
@ -404,19 +404,19 @@ public class DnsNameResolverTest {
|
|||||||
});
|
});
|
||||||
dnsServer2.start();
|
dnsServer2.start();
|
||||||
try {
|
try {
|
||||||
final Set<String> overridenHostnames = new HashSet<String>();
|
final Set<String> overriddenHostnames = new HashSet<String>();
|
||||||
for (String name : DOMAINS) {
|
for (String name : DOMAINS) {
|
||||||
if (EXCLUSIONS_RESOLVE_A.contains(name)) {
|
if (EXCLUSIONS_RESOLVE_A.contains(name)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (PlatformDependent.threadLocalRandom().nextBoolean()) {
|
if (PlatformDependent.threadLocalRandom().nextBoolean()) {
|
||||||
overridenHostnames.add(name);
|
overriddenHostnames.add(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DnsNameResolver resolver = newResolver(false, new DnsServerAddressStreamProvider() {
|
DnsNameResolver resolver = newResolver(false, new DnsServerAddressStreamProvider() {
|
||||||
@Override
|
@Override
|
||||||
public DnsServerAddressStream nameServerAddressStream(String hostname) {
|
public DnsServerAddressStream nameServerAddressStream(String hostname) {
|
||||||
return overridenHostnames.contains(hostname) ? sequential(dnsServer2.localAddress()).stream() :
|
return overriddenHostnames.contains(hostname) ? sequential(dnsServer2.localAddress()).stream() :
|
||||||
null;
|
null;
|
||||||
}
|
}
|
||||||
}).build();
|
}).build();
|
||||||
@ -426,7 +426,7 @@ public class DnsNameResolverTest {
|
|||||||
if (resolvedEntry.getValue().isLoopbackAddress()) {
|
if (resolvedEntry.getValue().isLoopbackAddress()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (overridenHostnames.contains(resolvedEntry.getKey())) {
|
if (overriddenHostnames.contains(resolvedEntry.getKey())) {
|
||||||
assertEquals("failed to resolve " + resolvedEntry.getKey(),
|
assertEquals("failed to resolve " + resolvedEntry.getKey(),
|
||||||
overriddenIP, resolvedEntry.getValue().getHostAddress());
|
overriddenIP, resolvedEntry.getValue().getHostAddress());
|
||||||
} else {
|
} else {
|
||||||
|
@ -67,7 +67,7 @@ public class KQueueChannelConfig extends DefaultChannelConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If this is {@code true} then the {@link RecvByteBufAllocator.Handle#guess()} will be overriden to always attempt
|
* If this is {@code true} then the {@link RecvByteBufAllocator.Handle#guess()} will be overridden to always attempt
|
||||||
* to read as many bytes as kqueue says are available.
|
* to read as many bytes as kqueue says are available.
|
||||||
*/
|
*/
|
||||||
public KQueueChannelConfig setRcvAllocTransportProvidesGuess(boolean transportProvidesGuess) {
|
public KQueueChannelConfig setRcvAllocTransportProvidesGuess(boolean transportProvidesGuess) {
|
||||||
@ -76,7 +76,7 @@ public class KQueueChannelConfig extends DefaultChannelConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If this is {@code true} then the {@link RecvByteBufAllocator.Handle#guess()} will be overriden to always attempt
|
* If this is {@code true} then the {@link RecvByteBufAllocator.Handle#guess()} will be overridden to always attempt
|
||||||
* to read as many bytes as kqueue says are available.
|
* to read as many bytes as kqueue says are available.
|
||||||
*/
|
*/
|
||||||
public boolean getRcvAllocTransportProvidesGuess() {
|
public boolean getRcvAllocTransportProvidesGuess() {
|
||||||
|
@ -27,7 +27,7 @@ public final class KQueueChannelOption<T> extends UnixChannelOption<T> {
|
|||||||
public static final ChannelOption<AcceptFilter> SO_ACCEPTFILTER =
|
public static final ChannelOption<AcceptFilter> SO_ACCEPTFILTER =
|
||||||
valueOf(KQueueChannelOption.class, "SO_ACCEPTFILTER");
|
valueOf(KQueueChannelOption.class, "SO_ACCEPTFILTER");
|
||||||
/**
|
/**
|
||||||
* If this is {@code true} then the {@link RecvByteBufAllocator.Handle#guess()} will be overriden to always attempt
|
* If this is {@code true} then the {@link RecvByteBufAllocator.Handle#guess()} will be overridden to always attempt
|
||||||
* to read as many bytes as kqueue says are available.
|
* to read as many bytes as kqueue says are available.
|
||||||
*/
|
*/
|
||||||
public static final ChannelOption<Boolean> RCV_ALLOC_TRANSPORT_PROVIDES_GUESS =
|
public static final ChannelOption<Boolean> RCV_ALLOC_TRANSPORT_PROVIDES_GUESS =
|
||||||
|
@ -44,7 +44,7 @@ import static io.netty.channel.kqueue.KQueueStaticallyReferencedJniMethods.noteR
|
|||||||
import static io.netty.channel.unix.Errors.newIOException;
|
import static io.netty.channel.unix.Errors.newIOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Navite helper methods
|
* Native helper methods
|
||||||
* <p><strong>Internal usage only!</strong>
|
* <p><strong>Internal usage only!</strong>
|
||||||
*/
|
*/
|
||||||
final class Native {
|
final class Native {
|
||||||
|
@ -15,18 +15,20 @@
|
|||||||
*/
|
*/
|
||||||
package io.netty.channel.unix;
|
package io.netty.channel.unix;
|
||||||
|
|
||||||
|
import io.netty.buffer.ByteBuf;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Different modes of reading from a {@link DomainSocketChannel}.
|
* Different modes of reading from a {@link DomainSocketChannel}.
|
||||||
*/
|
*/
|
||||||
public enum DomainSocketReadMode {
|
public enum DomainSocketReadMode {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read (@link ByteBuf)s from the {@link DomainSocketChannel}.
|
* Read {@link ByteBuf}s from the {@link DomainSocketChannel}.
|
||||||
*/
|
*/
|
||||||
BYTES,
|
BYTES,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read (@link FileDscriptor)s from the {@link DomainSocketChannel}.
|
* Read {@link FileDescriptor}s from the {@link DomainSocketChannel}.
|
||||||
*/
|
*/
|
||||||
FILE_DESCRIPTORS
|
FILE_DESCRIPTORS
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ public abstract class AbstractCoalescingBufferQueue {
|
|||||||
*
|
*
|
||||||
* @param channel the {@link Channel} which will have the {@link Channel#isWritable()} reflect the amount of queued
|
* @param channel the {@link Channel} which will have the {@link Channel#isWritable()} reflect the amount of queued
|
||||||
* buffers or {@code null} if there is no writability state updated.
|
* buffers or {@code null} if there is no writability state updated.
|
||||||
* @param initSize theinitial size of the underlying queue.
|
* @param initSize the initial size of the underlying queue.
|
||||||
*/
|
*/
|
||||||
protected AbstractCoalescingBufferQueue(Channel channel, int initSize) {
|
protected AbstractCoalescingBufferQueue(Channel channel, int initSize) {
|
||||||
bufAndListenerPairs = new ArrayDeque<Object>(initSize);
|
bufAndListenerPairs = new ArrayDeque<Object>(initSize);
|
||||||
|
@ -44,7 +44,7 @@ public class DefaultFileRegion extends AbstractReferenceCounted implements FileR
|
|||||||
/**
|
/**
|
||||||
* Create a new instance
|
* Create a new instance
|
||||||
*
|
*
|
||||||
* @param file the {@link FileChannel} which should be transfered
|
* @param file the {@link FileChannel} which should be transferred
|
||||||
* @param position the position from which the transfer should start
|
* @param position the position from which the transfer should start
|
||||||
* @param count the number of bytes to transfer
|
* @param count the number of bytes to transfer
|
||||||
*/
|
*/
|
||||||
@ -68,7 +68,7 @@ public class DefaultFileRegion extends AbstractReferenceCounted implements FileR
|
|||||||
* Create a new instance using the given {@link File}. The {@link File} will be opened lazily or
|
* Create a new instance using the given {@link File}. The {@link File} will be opened lazily or
|
||||||
* explicitly via {@link #open()}.
|
* explicitly via {@link #open()}.
|
||||||
*
|
*
|
||||||
* @param f the {@link File} which should be transfered
|
* @param f the {@link File} which should be transferred
|
||||||
* @param position the position from which the transfer should start
|
* @param position the position from which the transfer should start
|
||||||
* @param count the number of bytes to transfer
|
* @param count the number of bytes to transfer
|
||||||
*/
|
*/
|
||||||
|
@ -58,7 +58,7 @@ public interface FileRegion extends ReferenceCounted {
|
|||||||
long position();
|
long position();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the bytes which was transfered already.
|
* Returns the bytes which was transferred already.
|
||||||
*
|
*
|
||||||
* @deprecated Use {@link #transferred()} instead.
|
* @deprecated Use {@link #transferred()} instead.
|
||||||
*/
|
*/
|
||||||
@ -66,7 +66,7 @@ public interface FileRegion extends ReferenceCounted {
|
|||||||
long transfered();
|
long transfered();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the bytes which was transfered already.
|
* Returns the bytes which was transferred already.
|
||||||
*/
|
*/
|
||||||
long transferred();
|
long transferred();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user