diff --git a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java index b995111876..e448897c13 100644 --- a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java @@ -248,7 +248,7 @@ public class Bootstrap { /** * Sets an option with the specified key and value. If there's already - * an option with the same key, it's replaced with the new value. If the + * an option with the same key, it is replaced with the new value. If the * specified value is {@code null}, an existing option with the specified * key is removed. */ diff --git a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java index 0bb787dbbc..4cff4fa74b 100644 --- a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java @@ -86,7 +86,7 @@ import org.jboss.netty.channel.SimpleChannelHandler; * *
* Other event types and conditions which were not addressed here will be * ignored and discarded. Please note that there's no {@code "open"} in the - * table. It's because a {@link Channel} is always open when it's created + * table. It is because a {@link Channel} is always open when it is created * by a {@link ChannelFactory}. * *
- * Please note that this annotation doesn't prevent a handler annotated with + * Please note that this annotation does not prevent a handler annotated with * the value {@code "one"} from being added to more than one pipeline. This * annotation is used for documentation purpose only. * diff --git a/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java index 756d4f5b4e..557ea37476 100644 --- a/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java +++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java @@ -26,7 +26,7 @@ package org.jboss.netty.channel; * Creates a new {@link ChannelPipeline} for a new {@link Channel}. *
* This interface was introduced to initialize the {@link ChannelPipeline} of - * the child channel accepted by a server-side, but it's safe to use it for + * the child channel accepted by a server-side, but it is safe to use it for * any other purposes. * * @author The Netty Project (netty-dev@lists.jboss.org) diff --git a/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java b/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java index a56b24ddec..4bc69831e6 100644 --- a/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java +++ b/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java @@ -162,7 +162,7 @@ import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; * If there's no {@link ExecutionHandler} in the {@link ChannelPipeline}, * {@link #handleUpstream(ChannelHandlerContext, ChannelEvent) handleUpstream} * will be invoked sequentially by the same thread (i.e. an I/O thread). - * Please note that this doesn't necessarily mean that there's a dedicated + * Please note that this does not necessarily mean that there's a dedicated * thread per {@link Channel}; the I/O thread of some transport can serve more * than one {@link Channel} (e.g. NIO transport), while the I/O thread of * other transports can serve only one (e.g. OIO transport). diff --git a/src/main/java/org/jboss/netty/channel/Channels.java b/src/main/java/org/jboss/netty/channel/Channels.java index 3c4ec889e0..1973df1473 100644 --- a/src/main/java/org/jboss/netty/channel/Channels.java +++ b/src/main/java/org/jboss/netty/channel/Channels.java @@ -196,7 +196,7 @@ public class Channels { * Sends a {@code "channelOpen"} event to the next * {@link ChannelUpstreamHandler} in the {@link ChannelPipeline} where * the specified {@link ChannelHandlerContext} belongs. Please note that - * this method doesn't send a {@code "childChannelOpen"} event unlike + * this method does not send a {@code "childChannelOpen"} event unlike * {@link #fireChannelOpen(Channel)} method. */ public static void fireChannelOpen( diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java index 09b2f7eadf..9263660e4a 100644 --- a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java +++ b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java @@ -555,7 +555,7 @@ public class DefaultChannelPipeline implements ChannelPipeline { if (coverage == null) { logger.warn( "Handler '" + handler.getClass().getName() + - "' doesn't have a '" + + "' does not have a '" + ChannelPipelineCoverage.class.getSimpleName() + "' annotation with its class declaration. " + "It is recommended to add the annotation to tell if " + diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java index e01646c398..e0845a2c9d 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java @@ -112,8 +112,8 @@ public class DefaultReceiveBufferSizePredictor implements /** * Creates a new predictor with the default parameters. With the default - * parameters, the expected buffer size starts from {@code 1024}, doesn't - * go down below {@code 64}, and doesn't go up above {@code 65536}. + * parameters, the expected buffer size starts from {@code 1024}, does not + * go down below {@code 64}, and does not go up above {@code 65536}. */ public DefaultReceiveBufferSizePredictor() { this(DEFAULT_MINIMUM, DEFAULT_INITIAL, DEFAULT_MAXIMUM); diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java index 35e1fe319a..a477999d0a 100644 --- a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java +++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java @@ -287,7 +287,7 @@ class NioWorker implements Runnable { } failure = false; } catch (AsynchronousCloseException e) { - // Can happen, and doesn't need a user attention. + // Can happen, and does not need a user attention. } catch (Throwable t) { fireExceptionCaught(channel, t); } @@ -334,7 +334,7 @@ class NioWorker implements Runnable { } failure = false; } catch (AsynchronousCloseException e) { - // Can happen, and doesn't need a user attention. + // Can happen, and does not need a user attention. } catch (Throwable t) { fireExceptionCaught(channel, t); } diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java index 5623eda6ec..8ae23541bc 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java @@ -74,7 +74,7 @@ import org.jboss.netty.channel.socket.SocketChannel; * *
- * A {@link SocketChannel} created by this factory doesn't support asynchronous + * A {@link SocketChannel} created by this factory does not support asynchronous * operations. Any I/O requests such as {@code "connect"} and {@code "write"} * will be performed in a blocking manner. * diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java index e4440e6d42..d8afd7f433 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java @@ -87,7 +87,7 @@ import org.jboss.netty.channel.socket.ServerSocketChannelFactory; *
* A {@link ServerSocketChannel} created by this factory and its child channels - * don't support asynchronous operations. Any I/O requests such as + * do not support asynchronous operations. Any I/O requests such as * {@code "write"} will be performed in a blocking manner. * * @author The Netty Project (netty-dev@lists.jboss.org) diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java index 103ff5e9ac..a8cc4d446a 100644 --- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java +++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java @@ -224,7 +224,7 @@ class OioServerSocketPipelineSink extends AbstractChannelSink { } catch (SocketTimeoutException e) { // Thrown every second to stop when requested. } catch (IOException e) { - // Don't log the exception if the server socket was closed + // Do not log the exception if the server socket was closed // by a user. if (!channel.socket.isBound() || channel.socket.isClosed()) { break; diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java index d32f60a4c2..e46e0e75d2 100644 --- a/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java +++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java @@ -84,7 +84,7 @@ public class FactorialClient { "Factorial of %,d is: %,d", count, handler.getFactorial()); // We should shut down all thread pools here to exit normally. - // However, it's just fine to call System.exit(0) because we are + // However, it is just fine to call System.exit(0) because we are // finished with the business. System.exit(0); } diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java index 4f95b6568c..98a7a75a39 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java +++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java @@ -102,7 +102,7 @@ public class SecureChatClient { channel.close().awaitUninterruptibly(); // We should shut down all thread pools here to exit normally. - // However, it's just fine to call System.exit(0) because we are + // However, it is just fine to call System.exit(0) because we are // finished with the business. System.exit(0); } diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java index fcb3289fa5..890a41608b 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java +++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java @@ -103,7 +103,7 @@ public class SecureChatServerHandler extends SimpleChannelHandler { public void channelDisconnected( ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception { // Unregister the channel from the global channel list - // so the channel doesn't receive messages anymore. + // so the channel does not receive messages anymore. channels.remove(e.getChannel()); } diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java index f81ba85a67..c94fe76704 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java +++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java @@ -30,7 +30,7 @@ import javax.net.ssl.SSLContext; /** * Creates a bogus {@link SSLContext}. A client-side context created by this - * factory accepts any certificate even if it's invalid. A server-side context + * factory accepts any certificate even if it is invalid. A server-side context * created by this factory sends a bogus certificate defined in {@link SecureChatKeyStore}. * * You will have to create your context differently in a real world application. diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java index a17d2695e1..46ae56a83f 100644 --- a/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java +++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java @@ -35,7 +35,7 @@ import javax.net.ssl.X509TrustManager; /** * Bogus {@link TrustManagerFactorySpi} which accepts any certificate - * even if it's invalid. + * even if it is invalid. * * @author The Netty Project (netty-dev@lists.jboss.org) * @author Trustin Lee (tlee@redhat.com) @@ -51,13 +51,13 @@ public class SecureChatTrustManagerFactory extends TrustManagerFactorySpi { public void checkClientTrusted( X509Certificate[] arg0, String arg1) throws CertificateException { - // Always trust - it's an example. + // Always trust - it is an example. // You should do something in the real world. } public void checkServerTrusted( X509Certificate[] arg0, String arg1) throws CertificateException { - // Always trust - it's an example. + // Always trust - it is an example. // You should do something in the real world. } }; diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java index 01cf881ce4..afa54ae7bc 100644 --- a/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java +++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java @@ -102,7 +102,7 @@ public class TelnetClient { channel.close().awaitUninterruptibly(); // We should shut down all thread pools here to exit normally. - // However, it's just fine to call System.exit(0) because we are + // However, it is just fine to call System.exit(0) because we are // finished with the business. System.exit(0); } diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java index 42bb51c728..0b9d8e3502 100644 --- a/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java +++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java @@ -66,7 +66,7 @@ public class TelnetServerHandler extends SimpleChannelHandler { // Send greeting for a new connection. e.getChannel().write( "Welcome to " + InetAddress.getLocalHost().getHostName() + "!\n"); - e.getChannel().write("It's " + new Date() + " now.\n"); + e.getChannel().write("It is " + new Date() + " now.\n"); } @Override @@ -74,7 +74,7 @@ public class TelnetServerHandler extends SimpleChannelHandler { ChannelHandlerContext ctx, MessageEvent e) { // Cast to a String first. - // We know it's a String because we put some codec in TelnetPipelineFactory. + // We know it is a String because we put some codec in TelnetPipelineFactory. String request = (String) e.getMessage(); // Generate and write a response. @@ -89,7 +89,7 @@ public class TelnetServerHandler extends SimpleChannelHandler { response = "Did you say '" + request + "'?\n"; } - // We don't need to write a ChannelBuffer here. + // We do not need to write a ChannelBuffer here. // We know the encoder inserted at TelnetPipelineFactory will do the conversion. ChannelFuture future = e.getChannel().write(response); diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java index 325ca1bc27..26318304b4 100644 --- a/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java @@ -42,7 +42,7 @@ import org.jboss.netty.channel.SimpleChannelHandler; *
* In a stream-based transport such as TCP/IP, packets can be fragmented and * reassembled during transmission even in a LAN environment. For example, - * let's assume you have received three packets: + * let us assume you have received three packets: *
* +-----+-----+-----+ * | ABC | DEF | GHI | @@ -233,11 +233,11 @@ public abstract class FrameDecoder extends SimpleChannelHandler { if (frame == null) { if (oldReaderIndex == cumulation.readerIndex()) { // Seems like more data is required. - // Let's wait for the next notification. + // Let us wait for the next notification. break; } else { // Previous data has been discarded. - // Probably it's reading on. + // Probably it is reading on. continue; } } else if (oldReaderIndex == cumulation.readerIndex()) { diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java index 836062e3f7..a30689096f 100644 --- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java @@ -300,7 +300,7 @@ public abstract class ReplayingDecoder> extends SimpleChannelH "null cannot be returned if no data is consumed."); } else { // Previous data has been discarded. - // Probably it's reading on. + // Probably it is reading on. continue; } } @@ -311,7 +311,7 @@ public abstract class ReplayingDecoder > extends SimpleChannelH if (result == null) { // Seems like more data is required. - // Let's wait for the next notification. + // Let us wait for the next notification. break; } diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java index 392ada2616..ab9f2420d1 100644 --- a/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java +++ b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java @@ -45,6 +45,6 @@ class UnsafeDynamicChannelBuffer extends DynamicChannelBuffer { @Override protected void checkReadableBytes(int minReaderRemaining) { - // Don't check here - ReplayingDecoderBuffer will check. + // Do not check here - ReplayingDecoderBuffer will check. } } diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java index e98ea8e02f..12eef5bace 100644 --- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java @@ -42,7 +42,7 @@ import org.jboss.netty.util.SwitchableInputStream; * streams such as {@link ObjectInputStream} and {@link ObjectOutputStream}. * * However, this decoder might perform worse than {@link ObjectDecoder} if - * the serialized object is big and complex. Also, it doesn't limit the + * the serialized object is big and complex. Also, it does not limit the * maximum size of the object, and consequently your application might face * the risk of DoS attack. * Please use {@link ObjectEncoder} and {@link ObjectDecoder} if you are not diff --git a/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java b/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java index 0c209a4391..e6cbe28953 100644 --- a/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java +++ b/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java @@ -29,7 +29,7 @@ import org.jboss.netty.channel.ChannelHandlerContext; /** * a {@link Runnable} which sends the specified {@link ChannelEvent} upstream. - * Most users will not see this type at all because it's used by + * Most users will not see this type at all because it is used by * {@link Executor} implementors only * * @author The Netty Project (netty-dev@lists.jboss.org) diff --git a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java index e1719f8991..22b44d9f8a 100644 --- a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java +++ b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java @@ -175,7 +175,7 @@ public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor { this.objectSizeEstimator = objectSizeEstimator; // Call allowCoreThreadTimeOut(true) using reflection - // because it's not supported in Java 5. + // because it is not supported in Java 5. try { Method m = getClass().getMethod("allowCoreThreadTimeOut", new Class[] { boolean.class }); m.invoke(this, Boolean.TRUE); diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java index 7637cb468d..7cad5c86dd 100644 --- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java +++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java @@ -60,7 +60,7 @@ import org.jboss.netty.util.ImmediateExecutor; *
Beginning the handshake
** A user should make sure not to write a message while the - * {@linkplain #handshake(Channel) handshake} is in progress unless it's a + * {@linkplain #handshake(Channel) handshake} is in progress unless it is a * renegotiation. You will be notified by the {@link ChannelFuture} which is * returned by the {@link #handshake(Channel)} method when the handshake * process succeeds or fails. @@ -77,7 +77,7 @@ import org.jboss.netty.util.ImmediateExecutor; * exception is when you close the {@link Channel} - {@link SslHandler} * intercepts the close request and send the {@code close_notify} message * before the channel closure automatically. Once the SSL session is closed, - * it's not reusable, and consequently you should create a new + * it is not reusable, and consequently you should create a new * {@link SslHandler} with a new {@link SSLEngine} as explained in the * following section. * @@ -319,7 +319,7 @@ public class SslHandler extends FrameDecoder { return; } - // Don't encrypt the first write request if this handler is + // Do not encrypt the first write request if this handler is // created with startTLS flag turned on. if (startTls && sentFirstMessage.compareAndSet(false, true)) { context.sendDownstream(evt); @@ -498,7 +498,7 @@ public class SslHandler extends FrameDecoder { if (!success) { // Mark all remaining pending writes as failure if anything // wrong happened before the write requests are wrapped. - // Please note that we don't call setFailure while a lock is + // Please note that we do not call setFailure while a lock is // acquired, to avoid a potential dead lock. for (;;) { PendingWrite pendingWrite; diff --git a/src/main/java/org/jboss/netty/util/LinkedTransferQueue.java b/src/main/java/org/jboss/netty/util/LinkedTransferQueue.java index 87548bc44f..90814cb596 100644 --- a/src/main/java/org/jboss/netty/util/LinkedTransferQueue.java +++ b/src/main/java/org/jboss/netty/util/LinkedTransferQueue.java @@ -82,7 +82,7 @@ public class LinkedTransferQueue
extends AbstractQueue implements Blocking * * The main extension is to provide different Wait modes * for the main "xfer" method that puts or takes items. - * These don't impact the basic dual-queue logic, but instead + * These do not impact the basic dual-queue logic, but instead * control whether or how threads block upon insertion * of request or data nodes into the dual queue. */ @@ -109,7 +109,7 @@ public class LinkedTransferQueue extends AbstractQueue implements Blocking /** * The number of times to spin before blocking in untimed waits. * This is greater than timed value because untimed waits spin - * faster since they don't need to check times on each spin. + * faster since they do not need to check times on each spin. */ private static final int maxUntimedSpins = maxTimedSpins * 16; diff --git a/src/main/java/org/jboss/netty/util/MapUtil.java b/src/main/java/org/jboss/netty/util/MapUtil.java index 409ca2c165..a7b9321be7 100644 --- a/src/main/java/org/jboss/netty/util/MapUtil.java +++ b/src/main/java/org/jboss/netty/util/MapUtil.java @@ -84,7 +84,7 @@ public class MapUtil { if (logger.isDebugEnabled()) { logger.debug( mapType.getName() + - " doesn't implement OrderedMap interface."); + " does not implement OrderedMap interface."); } // Last resort: try to create a new instance and test if it maintains diff --git a/src/main/java/org/jboss/netty/util/StackTraceSimplifier.java b/src/main/java/org/jboss/netty/util/StackTraceSimplifier.java index db365dfd4b..03e7314149 100644 --- a/src/main/java/org/jboss/netty/util/StackTraceSimplifier.java +++ b/src/main/java/org/jboss/netty/util/StackTraceSimplifier.java @@ -68,7 +68,7 @@ public class StackTraceSimplifier { return; } - // Perhaps Netty bug. Let's not strip things out. + // Perhaps Netty bug. Let us not strip things out. if (EXCLUDED_STACK_TRACE.matcher(trace[0].getClassName()).matches()) { return; } diff --git a/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java b/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java index 0c678cf0b0..cfcc5c7faf 100644 --- a/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java +++ b/src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java @@ -79,7 +79,7 @@ public class ThreadRenamingRunnable implements Runnable { } finally { if (renamed) { // Revert the name back if the current thread was renamed. - // We don't check the exception here because we know it works. + // We do not check the exception here because we know it works. currentThread.setName(oldThreadName); } } diff --git a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java index 2c17a5bfe8..5c9a771390 100644 --- a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java +++ b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java @@ -132,7 +132,7 @@ public abstract class AbstractSocketServerBootstrapTest { } // Wait until the child connection is closed in the client side. - // We don't use Channel.close() to make sure it's closed automatically. + // We do not use Channel.close() to make sure it is closed automatically. while (pch.child.isOpen()) { try { Thread.sleep(1); diff --git a/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java index f42add4067..1ab6ce8cee 100644 --- a/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java +++ b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java @@ -1194,7 +1194,7 @@ public abstract class AbstractChannelBufferTest { ChannelBuffer actualValue = buffer.readBytes(BLOCK_SIZE); assertEquals(wrappedBuffer(expectedValue), actualValue); - // Make sure if it's a copied buffer. + // Make sure if it is a copied buffer. actualValue.setByte(0, (byte) (actualValue.getByte(0) + 1)); assertFalse(buffer.getByte(i) == actualValue.getByte(0)); } @@ -1219,7 +1219,7 @@ public abstract class AbstractChannelBufferTest { ChannelBuffer copy = buffer.readBytes(ChannelBufferIndexFinder.NUL); assertEquals(wrappedBuffer(new byte[] { 1, 2, 3, 4 }), copy); - // Make sure if it's a copied buffer. + // Make sure if it is a copied buffer. copy.setByte(0, (byte) (copy.getByte(0) + 1)); assertFalse(buffer.getByte(0) == copy.getByte(0)); } @@ -1244,7 +1244,7 @@ public abstract class AbstractChannelBufferTest { ChannelBuffer actualValue = buffer.readSlice(BLOCK_SIZE); assertEquals(wrappedBuffer(expectedValue), actualValue); - // Make sure if it's a sliced buffer. + // Make sure if it is a sliced buffer. actualValue.setByte(0, (byte) (actualValue.getByte(0) + 1)); assertEquals(buffer.getByte(i), actualValue.getByte(0)); } @@ -1269,7 +1269,7 @@ public abstract class AbstractChannelBufferTest { ChannelBuffer slice = buffer.readSlice(ChannelBufferIndexFinder.NUL); assertEquals(wrappedBuffer(new byte[] { 1, 2, 3, 4 }), slice); - // Make sure if it's a sliced buffer. + // Make sure if it is a sliced buffer. slice.setByte(0, (byte) (slice.getByte(0) + 1)); assertTrue(buffer.getByte(0) == slice.getByte(0)); }