ZOOKEEPER-1778. Use static final Logger objects (Rakesh R via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1529344 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -421,9 +421,11 @@ BUGFIXES:
   ZOOKEEPER-732. Improper translation of error into Python exception
   (Andrei Savu, Lei Zhang, fpj via fpj)
 
-  ZOOKEEPER-1766 Consistent log severity level guards and statements
+  ZOOKEEPER-1766. Consistent log severity level guards and statements
   (Jackie Chang via michim)
 
+  ZOOKEEPER-1778. Use static final Logger objects (Rakesh R via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

src/java/main/org/apache/zookeeper/Login.java

@@ -41,7 +41,7 @@ import java.util.Random;
 import java.util.Set;
 
 public class Login {
-    Logger LOG = Logger.getLogger(Login.class);
+    private static final Logger LOG = Logger.getLogger(Login.class);
     public CallbackHandler callbackHandler;
 
     // LoginThread will sleep until 80% of time from last refresh to

src/java/main/org/apache/zookeeper/Shell.java

@@ -49,7 +49,7 @@ import org.apache.log4j.Logger;
  */
 abstract public class Shell {
   
-  Logger LOG = Logger.getLogger(Shell.class);
+  private static final Logger LOG = Logger.getLogger(Shell.class);
   
   /** a Unix command to get the current user's name */
   public final static String USER_NAME_COMMAND = "whoami";

src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -58,7 +58,7 @@ import org.apache.zookeeper.server.util.OSMXBean;
  * client, but only one thread doing the communication.
  */
 public class NIOServerCnxn extends ServerCnxn {
-    static final Logger LOG = LoggerFactory.getLogger(NIOServerCnxn.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NIOServerCnxn.class);
 
     private final NIOServerCnxnFactory factory;
 

src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java

@@ -55,7 +55,7 @@ import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.MessageEvent;
 
 public class NettyServerCnxn extends ServerCnxn {
-    Logger LOG = LoggerFactory.getLogger(NettyServerCnxn.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NettyServerCnxn.class);
     Channel channel;
     ChannelBuffer queuedBuffer;
     volatile boolean throttled;

src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java

@@ -46,7 +46,7 @@ import org.jboss.netty.channel.group.DefaultChannelGroup;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class NettyServerCnxnFactory extends ServerCnxnFactory {
-    Logger LOG = LoggerFactory.getLogger(NettyServerCnxnFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NettyServerCnxnFactory.class);
 
     ServerBootstrap bootstrap;
     Channel parentChannel;

src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java

@@ -46,7 +46,7 @@ public abstract class ServerCnxnFactory {
         public void processPacket(ByteBuffer packet, ServerCnxn src);
     }
     
-    Logger LOG = LoggerFactory.getLogger(ServerCnxnFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ServerCnxnFactory.class);
 
     /**
      * The buffer will cause the connection to be close when we do a send.

src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java

@@ -41,7 +41,7 @@ public class ZooKeeperSaslServer {
     public static final String LOGIN_CONTEXT_NAME_KEY = "zookeeper.sasl.serverconfig";
     public static final String DEFAULT_LOGIN_CONTEXT_NAME = "Server";
 
-    Logger LOG = LoggerFactory.getLogger(ZooKeeperSaslServer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperSaslServer.class);
     private SaslServer saslServer;
 
     ZooKeeperSaslServer(final Login login) {

src/java/main/org/apache/zookeeper/server/ZooTrace.java

@@ -58,7 +58,7 @@ public class ZooTrace {
 
     public static void setTextTraceLevel(long mask) {
         traceMask = mask;
-        Logger LOG = LoggerFactory.getLogger(ZooTrace.class);
+        final Logger LOG = LoggerFactory.getLogger(ZooTrace.class);
         LOG.info("Set text trace mask to 0x" + Long.toHexString(mask));
     }
 

src/java/main/org/apache/zookeeper/server/util/OSMXBean.java

@@ -39,7 +39,7 @@ import java.lang.reflect.Method;
  */
 public class OSMXBean
 {
-    static final Logger LOG = LoggerFactory.getLogger(OSMXBean.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OSMXBean.class);
 
     private OperatingSystemMXBean osMbean;