You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2013/10/05 00:57:41 UTC
svn commit: r1529344 - in /zookeeper/trunk: ./
src/java/main/org/apache/zookeeper/
src/java/main/org/apache/zookeeper/server/
src/java/main/org/apache/zookeeper/server/util/
Author: michim
Date: Fri Oct 4 22:57:41 2013
New Revision: 1529344
URL: http://svn.apache.org/r1529344
Log:
ZOOKEEPER-1778. Use static final Logger objects (Rakesh R via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/Login.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/Shell.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Oct 4 22:57:41 2013
@@ -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,
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/Login.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/Login.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/Login.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/Login.java Fri Oct 4 22:57:41 2013
@@ -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
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/Shell.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/Shell.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/Shell.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/Shell.java Fri Oct 4 22:57:41 2013
@@ -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";
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java Fri Oct 4 22:57:41 2013
@@ -58,7 +58,7 @@ import org.apache.zookeeper.server.util.
* 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;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java Fri Oct 4 22:57:41 2013
@@ -55,7 +55,7 @@ import org.jboss.netty.channel.ChannelFu
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;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java Fri Oct 4 22:57:41 2013
@@ -46,7 +46,7 @@ import org.jboss.netty.channel.group.Def
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;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java Fri Oct 4 22:57:41 2013
@@ -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.
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java Fri Oct 4 22:57:41 2013
@@ -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) {
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java Fri Oct 4 22:57:41 2013
@@ -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));
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java?rev=1529344&r1=1529343&r2=1529344&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java Fri Oct 4 22:57:41 2013
@@ -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;