From 13569481bf9b5a5e3c8924a76d186d86da5f8ad9 Mon Sep 17 00:00:00 2001
From: Idel Pivnitskiy <Idel.Pivnitskiy@gmail.com>
Date: Sun, 20 Jul 2014 00:40:45 +0400
Subject: [PATCH] Small fixes and improvements

Motivation:

Fix some typos in Netty.

Modifications:

- Fix potentially dangerous use of non-short-circuit logic in Recycler.transfer(Stack<?>).
- Removed double 'the the' in javadoc of EmbeddedChannel.
- Write to log an exception message if we can not get SOMAXCONN in the NetUtil's static block.
---
 common/src/main/java/io/netty/util/NetUtil.java               | 2 +-
 common/src/main/java/io/netty/util/Recycler.java              | 2 +-
 .../main/java/io/netty/channel/embedded/EmbeddedChannel.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/io/netty/util/NetUtil.java b/common/src/main/java/io/netty/util/NetUtil.java
index 42cb89e947..fe76d97f2b 100644
--- a/common/src/main/java/io/netty/util/NetUtil.java
+++ b/common/src/main/java/io/netty/util/NetUtil.java
@@ -186,7 +186,7 @@ public final class NetUtil {
             somaxconn = Integer.parseInt(in.readLine());
             logger.debug("/proc/sys/net/core/somaxconn: {}", somaxconn);
         } catch (Exception e) {
-            // Failed to get SOMAXCONN
+            logger.debug("Failed to get SOMAXCONN", e);
         } finally {
             if (in != null) {
                 try {
diff --git a/common/src/main/java/io/netty/util/Recycler.java b/common/src/main/java/io/netty/util/Recycler.java
index 2beb4b6022..ba506eb4b3 100644
--- a/common/src/main/java/io/netty/util/Recycler.java
+++ b/common/src/main/java/io/netty/util/Recycler.java
@@ -232,7 +232,7 @@ public abstract class Recycler<T> {
             }
             to.size = size;
 
-            if (end == LINK_CAPACITY & head.next != null) {
+            if (end == LINK_CAPACITY && head.next != null) {
                 this.head = head.next;
             }
 
diff --git a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
index 62777685de..8ebb7b8f2a 100644
--- a/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
+++ b/transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
@@ -156,7 +156,7 @@ public class EmbeddedChannel extends AbstractChannel {
      *
      * @param msgs the messages to be written
      *
-     * @return {@code true} if the write operation did add something to the the inbound buffer
+     * @return {@code true} if the write operation did add something to the inbound buffer
      */
     public boolean writeInbound(Object... msgs) {
         ensureOpen();
@@ -178,7 +178,7 @@ public class EmbeddedChannel extends AbstractChannel {
      * Write messages to the outbound of this {@link Channel}.
      *
      * @param msgs              the messages to be written
-     * @return bufferReadable   returns {@code true} if the write operation did add something to the the outbound buffer
+     * @return bufferReadable   returns {@code true} if the write operation did add something to the outbound buffer
      */
     public boolean writeOutbound(Object... msgs) {
         ensureOpen();