bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject [2/2] bookkeeper git commit: BOOKKEEPER-687: Use static final Logger for hedwig related modules (Ankur Garg via sijie)
Date Thu, 16 Jul 2015 06:28:59 GMT
BOOKKEEPER-687: Use static final Logger for hedwig related modules (Ankur Garg via sijie)


Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/8c1b9ebc
Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/8c1b9ebc
Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/8c1b9ebc

Branch: refs/heads/master
Commit: 8c1b9ebc22988aabb42ba9cfe79be8898fc5a69e
Parents: a80bba2
Author: Sijie Guo <sijie@apache.org>
Authored: Wed Jul 15 23:28:46 2015 -0700
Committer: Sijie Guo <sijie@apache.org>
Committed: Wed Jul 15 23:28:46 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                           |  2 ++
 .../hedwig/client/benchmark/BenchmarkPublisher.java   |  3 +++
 .../hedwig/client/benchmark/BenchmarkSubscriber.java  |  2 +-
 .../hedwig/client/conf/ClientConfiguration.java       |  2 +-
 .../client/handlers/AbstractResponseHandler.java      |  2 +-
 .../handlers/CloseSubscriptionResponseHandler.java    |  8 +-------
 .../client/handlers/MessageConsumeCallback.java       |  2 +-
 .../apache/hedwig/client/handlers/PubSubCallback.java |  2 +-
 .../client/handlers/PublishResponseHandler.java       |  4 +---
 .../client/handlers/SubscribeResponseHandler.java     |  5 +----
 .../client/handlers/UnsubscribeResponseHandler.java   |  7 +------
 .../apache/hedwig/client/netty/CleanupChannelMap.java |  2 +-
 .../apache/hedwig/client/netty/HedwigPublisher.java   |  2 +-
 .../apache/hedwig/client/netty/HedwigSubscriber.java  |  2 +-
 .../client/netty/impl/AbstractHChannelManager.java    |  4 +---
 .../netty/impl/AbstractSubscribeResponseHandler.java  | 14 +-------------
 .../client/netty/impl/DefaultServerChannel.java       |  2 +-
 .../hedwig/client/netty/impl/HChannelHandler.java     |  4 +---
 .../hedwig/client/netty/impl/ResubscribeCallback.java |  2 +-
 .../hedwig/client/netty/impl/WriteCallback.java       |  2 +-
 .../impl/multiplex/MultiplexHChannelManager.java      |  7 +------
 .../multiplex/MultiplexSubscribeResponseHandler.java  |  2 +-
 .../netty/impl/simple/SimpleHChannelManager.java      |  2 +-
 .../impl/simple/SimpleSubscribeResponseHandler.java   |  8 ++------
 .../SimpleSubscriptionChannelPipelineFactory.java     |  2 --
 .../main/java/org/apache/hedwig/util/FileUtils.java   |  2 +-
 .../java/org/apache/hedwig/admin/HedwigAdmin.java     |  5 +----
 .../java/org/apache/hedwig/data/MessageFormatter.java |  2 +-
 .../hedwig/server/benchmark/AbstractBenchmark.java    |  2 +-
 .../hedwig/server/benchmark/BookieBenchmark.java      |  2 +-
 .../apache/hedwig/server/benchmark/FakeBookie.java    |  2 +-
 .../server/common/TerminateJVMExceptionHandler.java   |  2 +-
 .../hedwig/server/delivery/FIFODeliveryManager.java   |  1 -
 .../hedwig/server/handlers/SubscribeHandler.java      |  4 +---
 .../server/handlers/SubscriptionChannelManager.java   |  3 +--
 .../hedwig/server/handlers/UnsubscribeHandler.java    |  2 --
 .../org/apache/hedwig/server/meta/FactoryLayout.java  |  2 +-
 .../hedwig/server/meta/MetadataManagerFactory.java    |  2 +-
 .../hedwig/server/meta/SubscriptionDataManager.java   |  1 -
 .../hedwig/server/meta/TopicOwnershipManager.java     |  7 -------
 .../hedwig/server/meta/ZkMetadataManagerFactory.java  |  2 --
 .../org/apache/hedwig/server/netty/PubSubServer.java  |  2 +-
 .../apache/hedwig/server/netty/UmbrellaHandler.java   |  2 +-
 .../persistence/BookkeeperPersistenceManager.java     |  2 +-
 .../apache/hedwig/server/persistence/CacheValue.java  |  2 +-
 .../server/persistence/LocalDBPersistenceManager.java |  2 +-
 .../hedwig/server/persistence/ReadAheadCache.java     |  2 +-
 .../org/apache/hedwig/server/proxy/HedwigProxy.java   |  2 +-
 .../server/proxy/ProxyCloseSubscriptionHandler.java   |  2 +-
 .../hedwig/server/proxy/ProxyConsumeHandler.java      |  2 +-
 .../server/proxy/ProxyStartDeliveryHandler.java       |  2 +-
 .../hedwig/server/proxy/ProxyStopDeliveryHandler.java |  2 +-
 .../hedwig/server/proxy/ProxySubscribeHandler.java    |  2 +-
 .../subscriptions/AbstractSubscriptionManager.java    |  8 +-------
 .../subscriptions/InMemorySubscriptionManager.java    |  5 ++++-
 .../subscriptions/InMemorySubscriptionState.java      |  4 +---
 .../server/subscriptions/MMSubscriptionManager.java   |  6 +++++-
 .../apache/hedwig/server/topics/MMTopicManager.java   |  2 +-
 .../apache/hedwig/server/topics/ZkTopicManager.java   |  4 +---
 .../java/org/apache/hedwig/zookeeper/ZkUtils.java     |  2 +-
 .../org/apache/hedwig/server/HedwigHubTestBase.java   |  2 +-
 .../apache/hedwig/server/HedwigRegionTestBase.java    |  2 +-
 .../apache/hedwig/server/LoggingExceptionHandler.java |  2 +-
 .../hedwig/server/PubSubServerStandAloneTestBase.java |  2 +-
 .../org/apache/hedwig/server/TestBackwardCompat.java  |  2 +-
 .../apache/hedwig/server/TestPubSubServerStartup.java |  2 +-
 .../server/delivery/TestFIFODeliveryManager.java      |  2 +-
 .../server/meta/MetadataManagerFactoryTestCase.java   |  3 +--
 .../apache/hedwig/server/meta/TestFactoryLayout.java  |  1 -
 .../server/meta/TestMetadataManagerFactory.java       |  9 +--------
 .../hedwig/server/persistence/BookKeeperTestBase.java |  2 +-
 .../persistence/MessageBoundedPersistenceTest.java    |  2 +-
 .../persistence/TestBookKeeperPersistenceManager.java |  2 +-
 .../TestBookKeeperPersistenceManagerBlackBox.java     |  4 ----
 .../TestBookkeeperPersistenceManagerWhiteBox.java     |  2 +-
 .../hedwig/server/persistence/TestDeadlock.java       |  2 +-
 .../TestLocalDBPersistenceManagerBlackBox.java        |  3 ---
 .../persistence/TestPersistenceManagerBlackBox.java   |  2 +-
 .../persistence/TestReadAheadCacheWhiteBox.java       |  1 -
 .../subscriptions/TestUpdateSubscriptionState.java    |  2 --
 .../server/topics/TestConcurrentTopicAcquisition.java |  2 --
 .../hedwig/server/topics/TestMMTopicManager.java      |  5 +----
 .../hedwig/server/topics/TestZkTopicManager.java      |  2 +-
 83 files changed, 82 insertions(+), 166 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2cbc970..c745181 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -85,6 +85,8 @@ Trunk (unreleased changes)
 
       BOOKKEEPER-796: Make bookkeeper client use reconnectable zookeeper wrapper (sijie via fpj)
 
+      BOOKKEEPER-687: Use static final Logger for hedwig related modules (Ankur Garg via sijie)
+
       bookkeeper-client:
 
         BOOKKEEPER-810: Allow to configure TCP connect timeout (Charles Xie via sijie)

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkPublisher.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkPublisher.java b/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkPublisher.java
index af075c0..531840f 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkPublisher.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkPublisher.java
@@ -29,8 +29,11 @@ import org.apache.hedwig.protocol.PubSubProtocol.Message;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionOptions;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscribeRequest.CreateOrAttach;
 import org.apache.hedwig.util.Callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BenchmarkPublisher extends BenchmarkWorker {
+    private static final Logger logger = LoggerFactory.getLogger(BenchmarkPublisher.class);
     Publisher publisher;
     Subscriber subscriber;
     int msgSize;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java b/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
index 0f8cb7f..38dfc3c 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/benchmark/BenchmarkSubscriber.java
@@ -39,7 +39,7 @@ import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionOptions;
 import org.apache.hedwig.util.Callback;
 
 public class BenchmarkSubscriber extends BenchmarkWorker implements Callable<Void> {
-    static final Logger logger = LoggerFactory.getLogger(BenchmarkSubscriber.class);
+    private static final Logger logger = LoggerFactory.getLogger(BenchmarkSubscriber.class);
     Subscriber subscriber;
     ByteString subId;
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java b/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
index 21ce9d3..836a9d2 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
@@ -27,7 +27,7 @@ import org.apache.hedwig.conf.AbstractConfiguration;
 import org.apache.hedwig.util.HedwigSocketAddress;
 
 public class ClientConfiguration extends AbstractConfiguration {
-    Logger logger = LoggerFactory.getLogger(ClientConfiguration.class);
+    private static final Logger logger = LoggerFactory.getLogger(ClientConfiguration.class);
 
     // Protected member variables for configuration parameter names
     protected static final String DEFAULT_SERVER_HOST = "default_server_host";

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/AbstractResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/AbstractResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/AbstractResponseHandler.java
index bb2c0bb..b8a6787 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/AbstractResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/AbstractResponseHandler.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 
 public abstract class AbstractResponseHandler {
 
-    private static Logger logger = LoggerFactory.getLogger(AbstractResponseHandler.class);
+    private final static Logger logger = LoggerFactory.getLogger(AbstractResponseHandler.class);
 
     protected final ClientConfiguration cfg;
     protected final HChannelManager channelManager;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/CloseSubscriptionResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/CloseSubscriptionResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/CloseSubscriptionResponseHandler.java
index 102dfb5..c5b58a0 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/CloseSubscriptionResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/CloseSubscriptionResponseHandler.java
@@ -23,20 +23,14 @@ import org.jboss.netty.channel.Channel;
 
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
-import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.netty.HChannelManager;
-import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
 import org.apache.hedwig.exceptions.PubSubException.ServiceDownException;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
-import org.apache.hedwig.protocol.PubSubProtocol.ResponseBody;
-import org.apache.hedwig.util.Callback;
-import static org.apache.hedwig.util.VarArgs.va;
 
 public class CloseSubscriptionResponseHandler extends AbstractResponseHandler {
 
-    private static Logger logger =
-        LoggerFactory.getLogger(CloseSubscriptionResponseHandler.class);
+    private final static Logger logger = LoggerFactory.getLogger(CloseSubscriptionResponseHandler.class);
 
     public CloseSubscriptionResponseHandler(ClientConfiguration cfg,
                                             HChannelManager channelManager) {

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
index 436c14f..32517b0 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
@@ -41,7 +41,7 @@ import static org.apache.hedwig.util.VarArgs.va;
  */
 public class MessageConsumeCallback implements Callback<Void> {
 
-    private static Logger logger = LoggerFactory.getLogger(MessageConsumeCallback.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageConsumeCallback.class);
 
     private final HChannelManager channelManager;
     private final long consumeRetryWaitTime;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
index dacaa7a..3f5fbcd 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
@@ -33,7 +33,7 @@ import org.apache.hedwig.util.Callback;
  */
 public class PubSubCallback implements Callback<PubSubProtocol.ResponseBody> {
 
-    private static Logger logger = LoggerFactory.getLogger(PubSubCallback.class);
+    private static final Logger logger = LoggerFactory.getLogger(PubSubCallback.class);
 
     // Private member variables
     private final PubSubData pubSubData;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java
index fc6a025..8b2e9d1 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java
@@ -20,17 +20,15 @@ package org.apache.hedwig.client.handlers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.jboss.netty.channel.Channel;
-
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
 import org.apache.hedwig.client.netty.HChannelManager;
 import org.apache.hedwig.exceptions.PubSubException.ServiceDownException;
-import org.apache.hedwig.protocol.PubSubProtocol;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
 
 public class PublishResponseHandler extends AbstractResponseHandler {
 
-    private static Logger logger = LoggerFactory.getLogger(PublishResponseHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(PublishResponseHandler.class);
 
     public PublishResponseHandler(ClientConfiguration cfg,
                                   HChannelManager channelManager) {

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
index e2c685f..6b2a965 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
@@ -19,8 +19,7 @@ package org.apache.hedwig.client.handlers;
 
 import java.net.InetSocketAddress;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import org.jboss.netty.channel.Channel;
 
 import com.google.protobuf.ByteString;
@@ -29,7 +28,6 @@ import org.apache.hedwig.client.api.MessageHandler;
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.exceptions.AlreadyStartDeliveryException;
-import org.apache.hedwig.client.exceptions.NoResponseHandlerException;
 import org.apache.hedwig.client.netty.HChannelManager;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
 import org.apache.hedwig.protocol.PubSubProtocol.Message;
@@ -37,7 +35,6 @@ import org.apache.hedwig.protocol.PubSubProtocol.MessageSeqId;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
 import org.apache.hedwig.protocol.PubSubProtocol.ResponseBody;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionEvent;
-import org.apache.hedwig.protoextensions.SubscriptionStateUtils;
 import org.apache.hedwig.util.Callback;
 
 /**

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java
index 3ddd539..0d3e8a6 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java
@@ -23,19 +23,14 @@ import org.jboss.netty.channel.Channel;
 
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
-import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.netty.HChannelManager;
-import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
 import org.apache.hedwig.exceptions.PubSubException.ServiceDownException;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
-import org.apache.hedwig.protocol.PubSubProtocol.ResponseBody;
-import org.apache.hedwig.util.Callback;
-import static org.apache.hedwig.util.VarArgs.va;
 
 public class UnsubscribeResponseHandler extends AbstractResponseHandler {
 
-    private static Logger logger = LoggerFactory.getLogger(UnsubscribeResponseHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(UnsubscribeResponseHandler.class);
 
     public UnsubscribeResponseHandler(ClientConfiguration cfg,
                                       HChannelManager channelManager) {

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/CleanupChannelMap.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/CleanupChannelMap.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/CleanupChannelMap.java
index 0c676a1..a6ba2a6 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/CleanupChannelMap.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/CleanupChannelMap.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public class CleanupChannelMap<T> {
 
-    private static Logger logger = LoggerFactory.getLogger(CleanupChannelMap.class);
+    private static final Logger logger = LoggerFactory.getLogger(CleanupChannelMap.class);
     
     private final ConcurrentHashMap<T, HChannel> channels;
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
index 5611bdd..271d1eb 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
@@ -40,7 +40,7 @@ import org.apache.hedwig.util.Callback;
  */
 public class HedwigPublisher implements Publisher {
 
-    private static Logger logger = LoggerFactory.getLogger(HedwigPublisher.class);
+    private static final Logger logger = LoggerFactory.getLogger(HedwigPublisher.class);
 
     private final HChannelManager channelManager;
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java
index 7d2453a..0eda290 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java
@@ -55,7 +55,7 @@ import org.apache.hedwig.util.SubscriptionListener;
 @SuppressWarnings("deprecation") // so that we can implemented the Deprecated subscribe methods without a warning
 public class HedwigSubscriber implements Subscriber {
 
-    private static Logger logger = LoggerFactory.getLogger(HedwigSubscriber.class);
+    private static final Logger logger = LoggerFactory.getLogger(HedwigSubscriber.class);
 
     protected final ClientConfiguration cfg;
     protected final HChannelManager channelManager;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractHChannelManager.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractHChannelManager.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractHChannelManager.java
index 6fb8978..614efa1 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractHChannelManager.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractHChannelManager.java
@@ -36,14 +36,12 @@ import org.jboss.netty.channel.ChannelFutureListener;
 
 import com.google.protobuf.ByteString;
 
-import org.apache.hedwig.client.api.MessageHandler;
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
 import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.exceptions.AlreadyStartDeliveryException;
 import org.apache.hedwig.client.exceptions.NoResponseHandlerException;
 import org.apache.hedwig.client.handlers.MessageConsumeCallback;
-import org.apache.hedwig.client.handlers.SubscribeResponseHandler;
 import org.apache.hedwig.client.netty.CleanupChannelMap;
 import org.apache.hedwig.client.netty.HChannel;
 import org.apache.hedwig.client.netty.HChannelManager;
@@ -69,7 +67,7 @@ import static org.apache.hedwig.util.VarArgs.va;
  */
 public abstract class AbstractHChannelManager implements HChannelManager {
 
-    private static Logger logger = LoggerFactory.getLogger(AbstractHChannelManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(AbstractHChannelManager.class);
 
     // Empty Topic List
     private final static Set<ByteString> EMPTY_TOPIC_SET =

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractSubscribeResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractSubscribeResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractSubscribeResponseHandler.java
index ad5c2cd..7fcfc44 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractSubscribeResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/AbstractSubscribeResponseHandler.java
@@ -18,8 +18,6 @@
 package org.apache.hedwig.client.netty.impl;
 
 import java.net.InetSocketAddress;
-import java.util.LinkedList;
-import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -29,12 +27,9 @@ import com.google.protobuf.ByteString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
 
 import org.apache.hedwig.client.api.MessageHandler;
 import org.apache.hedwig.client.conf.ClientConfiguration;
-import org.apache.hedwig.client.data.MessageConsumeData;
 import org.apache.hedwig.client.data.PubSubData;
 import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.exceptions.AlreadyStartDeliveryException;
@@ -42,17 +37,12 @@ import org.apache.hedwig.client.handlers.SubscribeResponseHandler;
 import org.apache.hedwig.client.netty.HChannelManager;
 import org.apache.hedwig.client.netty.HChannel;
 import org.apache.hedwig.client.netty.NetUtils;
-import org.apache.hedwig.client.netty.FilterableMessageHandler;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.exceptions.PubSubException.ClientAlreadySubscribedException;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
 import org.apache.hedwig.exceptions.PubSubException.ServiceDownException;
-import org.apache.hedwig.exceptions.PubSubException.UnexpectedConditionException;
-import org.apache.hedwig.filter.ClientMessageFilter;
 import org.apache.hedwig.protocol.PubSubProtocol.Message;
 import org.apache.hedwig.protocol.PubSubProtocol.MessageSeqId;
-import org.apache.hedwig.protocol.PubSubProtocol.OperationType;
-import org.apache.hedwig.protocol.PubSubProtocol.PubSubRequest;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
 import org.apache.hedwig.protocol.PubSubProtocol.ResponseBody;
 import org.apache.hedwig.protocol.PubSubProtocol.StatusCode;
@@ -61,14 +51,12 @@ import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionEvent;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionPreferences;
 import org.apache.hedwig.protoextensions.MessageIdUtils;
 import org.apache.hedwig.protoextensions.SubscriptionStateUtils;
-import org.apache.hedwig.util.Callback;
 import org.apache.hedwig.util.Either;
-import org.apache.hedwig.util.SubscriptionListener;
 import static org.apache.hedwig.util.VarArgs.va;
 
 public abstract class AbstractSubscribeResponseHandler extends SubscribeResponseHandler {
 
-    private static Logger logger =
+    private static final Logger logger =
         LoggerFactory.getLogger(AbstractSubscribeResponseHandler.class);
 
     protected final ReentrantReadWriteLock disconnectLock =

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/DefaultServerChannel.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/DefaultServerChannel.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/DefaultServerChannel.java
index 10c05ef..065b2f7 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/DefaultServerChannel.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/DefaultServerChannel.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  */
 class DefaultServerChannel extends HChannelImpl {
 
-    private static Logger logger = LoggerFactory.getLogger(DefaultServerChannel.class);
+    private static final Logger logger = LoggerFactory.getLogger(DefaultServerChannel.class);
 
     DefaultServerChannel(InetSocketAddress host, AbstractHChannelManager channelManager) {
         super(host, channelManager);

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/HChannelHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/HChannelHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/HChannelHandler.java
index 8b751ae..c41a329 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/HChannelHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/HChannelHandler.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
@@ -34,7 +33,6 @@ import org.jboss.netty.handler.ssl.SslHandler;
 
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
-import org.apache.hedwig.client.exceptions.NoResponseHandlerException;
 import org.apache.hedwig.client.netty.NetUtils;
 import org.apache.hedwig.client.handlers.AbstractResponseHandler;
 import org.apache.hedwig.client.handlers.SubscribeResponseHandler;
@@ -49,7 +47,7 @@ import static org.apache.hedwig.util.VarArgs.va;
 
 public class HChannelHandler extends SimpleChannelHandler {
 
-    private static Logger logger = LoggerFactory.getLogger(HChannelHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(HChannelHandler.class);
 
     // Concurrent Map to store for each async PubSub request, the txn ID
     // and the corresponding PubSub call's data which stores the VoidCallback to

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ResubscribeCallback.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ResubscribeCallback.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ResubscribeCallback.java
index 4774d41..17d2401 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ResubscribeCallback.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/ResubscribeCallback.java
@@ -37,7 +37,7 @@ import static org.apache.hedwig.util.VarArgs.va;
  */
 class ResubscribeCallback implements Callback<ResponseBody> {
 
-    private static Logger logger = LoggerFactory.getLogger(ResubscribeCallback.class);
+    private static final Logger logger = LoggerFactory.getLogger(ResubscribeCallback.class);
 
     // Private member variables
     private final TopicSubscriber origTopicSubscriber;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/WriteCallback.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/WriteCallback.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/WriteCallback.java
index 26dd153..c7a71cb 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/WriteCallback.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/WriteCallback.java
@@ -35,7 +35,7 @@ import org.apache.hedwig.util.HedwigSocketAddress;
 
 public class WriteCallback implements ChannelFutureListener {
 
-    private static Logger logger = LoggerFactory.getLogger(WriteCallback.class);
+    private static final Logger logger = LoggerFactory.getLogger(WriteCallback.class);
 
     // Private member variables
     private PubSubData pubSubData;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexHChannelManager.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexHChannelManager.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexHChannelManager.java
index f28a6b2..caa0734 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexHChannelManager.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexHChannelManager.java
@@ -25,9 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-
 import org.apache.hedwig.client.api.MessageHandler;
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
@@ -42,13 +39,11 @@ import org.apache.hedwig.client.netty.impl.AbstractHChannelManager;
 import org.apache.hedwig.client.netty.impl.ClientChannelPipelineFactory;
 import org.apache.hedwig.client.netty.impl.HChannelHandler;
 import org.apache.hedwig.client.netty.impl.HChannelImpl;
-import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
-import org.apache.hedwig.exceptions.PubSubException.ServiceDownException;
-import org.apache.hedwig.protocol.PubSubProtocol.OperationType;
 import org.apache.hedwig.protocol.PubSubProtocol.ResponseBody;
 import org.apache.hedwig.util.Callback;
 import org.apache.hedwig.util.Either;
+
 import static org.apache.hedwig.util.VarArgs.va;
 
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexSubscribeResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexSubscribeResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexSubscribeResponseHandler.java
index ec111da..9b8ebe0 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexSubscribeResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/multiplex/MultiplexSubscribeResponseHandler.java
@@ -43,7 +43,7 @@ import static org.apache.hedwig.util.VarArgs.va;
 
 public class MultiplexSubscribeResponseHandler extends AbstractSubscribeResponseHandler {
 
-    private static Logger logger =
+    private static final Logger logger =
         LoggerFactory.getLogger(MultiplexSubscribeResponseHandler.class);
 
     // the underlying subscription channel

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleHChannelManager.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleHChannelManager.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleHChannelManager.java
index 36a6925..fb0a7d9 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleHChannelManager.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleHChannelManager.java
@@ -58,7 +58,7 @@ import static org.apache.hedwig.util.VarArgs.va;
  */
 public class SimpleHChannelManager extends AbstractHChannelManager {
 
-    private static Logger logger = LoggerFactory.getLogger(SimpleHChannelManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(SimpleHChannelManager.class);
 
     // Concurrent Map to store the cached Channel connections on the client side
     // to a server host for a given Topic + SubscriberId combination. For each

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java
index 7dd320c..ee5bd90 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscribeResponseHandler.java
@@ -17,7 +17,7 @@
  */
 package org.apache.hedwig.client.netty.impl.simple;
 
-import java.net.InetSocketAddress;
+
 import java.util.Set;
 import java.util.Collections;
 import java.util.concurrent.ConcurrentHashMap;
@@ -28,26 +28,22 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 
-import com.google.protobuf.ByteString;
 
 import org.apache.hedwig.client.api.MessageHandler;
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.data.PubSubData;
 import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.client.exceptions.AlreadyStartDeliveryException;
-import org.apache.hedwig.client.handlers.SubscribeResponseHandler;
 import org.apache.hedwig.client.netty.HChannel;
 import org.apache.hedwig.client.netty.HChannelManager;
 import org.apache.hedwig.client.netty.impl.AbstractHChannelManager;
 import org.apache.hedwig.client.netty.impl.AbstractSubscribeResponseHandler;
 import org.apache.hedwig.client.netty.impl.ActiveSubscriber;
 import org.apache.hedwig.client.netty.impl.HChannelImpl;
-import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.exceptions.PubSubException.ClientNotSubscribedException;
 import org.apache.hedwig.protocol.PubSubProtocol.Message;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
 import org.apache.hedwig.protocol.PubSubProtocol.ResponseBody;
-import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionEvent;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionPreferences;
 import org.apache.hedwig.protocol.PubSubProtocol.StatusCode;
 import org.apache.hedwig.protoextensions.MessageIdUtils;
@@ -56,7 +52,7 @@ import org.apache.hedwig.util.Either;
 
 public class SimpleSubscribeResponseHandler extends AbstractSubscribeResponseHandler {
 
-    private static Logger logger = LoggerFactory.getLogger(SimpleSubscribeResponseHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SimpleSubscribeResponseHandler.class);
 
     /**
      * Simple Active Subscriber enabling client-side throttling.

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscriptionChannelPipelineFactory.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscriptionChannelPipelineFactory.java b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscriptionChannelPipelineFactory.java
index 4c92309..d14f053 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscriptionChannelPipelineFactory.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/client/netty/impl/simple/SimpleSubscriptionChannelPipelineFactory.java
@@ -23,9 +23,7 @@ import java.util.Map;
 import org.apache.hedwig.client.conf.ClientConfiguration;
 import org.apache.hedwig.client.handlers.AbstractResponseHandler;
 import org.apache.hedwig.client.handlers.CloseSubscriptionResponseHandler;
-import org.apache.hedwig.client.netty.impl.AbstractHChannelManager;
 import org.apache.hedwig.client.netty.impl.ClientChannelPipelineFactory;
-import org.apache.hedwig.client.netty.impl.HChannelHandler;
 import org.apache.hedwig.protocol.PubSubProtocol.OperationType;
 
 public class SimpleSubscriptionChannelPipelineFactory extends ClientChannelPipelineFactory {

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java b/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java
index ad79b46..7bab01b 100644
--- a/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java
+++ b/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 public class FileUtils {
 
     static DirDeleterThred dirDeleterThread;
-    static Logger log = LoggerFactory.getLogger(FileUtils.class);
+    static final Logger log = LoggerFactory.getLogger(FileUtils.class);
 
     static {
         dirDeleterThread = new DirDeleterThred();

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java b/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java
index 7e084ec..ec38fc2 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/admin/HedwigAdmin.java
@@ -37,7 +37,6 @@ import org.apache.bookkeeper.versioning.Versioned;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.protocol.PubSubProtocol.LedgerRange;
 import org.apache.hedwig.protocol.PubSubProtocol.LedgerRanges;
-import org.apache.hedwig.protocol.PubSubProtocol.Message;
 import org.apache.hedwig.protocol.PubSubProtocol.MessageSeqId;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionData;
 import org.apache.hedwig.server.common.ServerConfiguration;
@@ -46,7 +45,6 @@ import org.apache.hedwig.server.meta.FactoryLayout;
 import org.apache.hedwig.server.meta.SubscriptionDataManager;
 import org.apache.hedwig.server.meta.TopicOwnershipManager;
 import org.apache.hedwig.server.meta.TopicPersistenceManager;
-import org.apache.hedwig.server.subscriptions.InMemorySubscriptionState;
 import org.apache.hedwig.server.topics.HubInfo;
 import org.apache.hedwig.server.topics.HubLoad;
 import org.apache.hedwig.util.Callback;
@@ -60,14 +58,13 @@ import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 
 import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
 import static com.google.common.base.Charsets.UTF_8;
 
 /**
  * Hedwig Admin
  */
 public class HedwigAdmin {
-    static final Logger LOG = LoggerFactory.getLogger(HedwigAdmin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HedwigAdmin.class);
 
     // NOTE: now it is fixed passwd used in hedwig
     static byte[] passwd = "sillysecret".getBytes(UTF_8);

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/data/MessageFormatter.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/data/MessageFormatter.java b/hedwig-server/src/main/java/org/apache/hedwig/data/MessageFormatter.java
index 8bd5603..6ac6879 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/data/MessageFormatter.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/data/MessageFormatter.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  * Format a pub sub message into a readable format.
  */
 public class MessageFormatter extends EntryFormatter {
-    static Logger logger = LoggerFactory.getLogger(MessageFormatter.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageFormatter.class);
 
     static final String MESSAGE_PAYLOAD_FORMATTER_CLASS = "message_payload_formatter_class";
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java b/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java
index 7f32036..21687eb 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java
@@ -30,7 +30,7 @@ import org.apache.hedwig.util.ConcurrencyUtils;
 
 public abstract class AbstractBenchmark {
 
-    static final Logger logger = LoggerFactory.getLogger(AbstractBenchmark.class);
+    private static final Logger logger = LoggerFactory.getLogger(AbstractBenchmark.class);
 
     AtomicLong totalLatency = new AtomicLong();
     LinkedBlockingQueue<Boolean> doneSignalQueue = new LinkedBlockingQueue<Boolean>();

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java b/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java
index 8f47c2f..7985d39 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java
@@ -36,7 +36,7 @@ import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class BookieBenchmark extends AbstractBenchmark {
 
-    static final Logger logger = LoggerFactory.getLogger(BookkeeperBenchmark.class);
+    private static final Logger logger = LoggerFactory.getLogger(BookkeeperBenchmark.class);
 
     BookieClient bkc;
     BookieSocketAddress addr;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java b/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java
index 0261dc9..ba81834 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java
@@ -41,7 +41,7 @@ import org.jboss.netty.logging.Log4JLoggerFactory;
 @Sharable
 public class FakeBookie extends SimpleChannelHandler implements
     ChannelPipelineFactory {
-    static final Logger logger = LoggerFactory.getLogger(FakeBookie.class);
+    private static final Logger logger = LoggerFactory.getLogger(FakeBookie.class);
     ServerSocketChannelFactory serverChannelFactory = new NioServerSocketChannelFactory(
         Executors.newCachedThreadPool(), Executors.newCachedThreadPool());
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java
index 3751092..fd8234f 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TerminateJVMExceptionHandler implements Thread.UncaughtExceptionHandler {
-    static Logger logger = LoggerFactory.getLogger(TerminateJVMExceptionHandler.class);
+    private static Logger logger = LoggerFactory.getLogger(TerminateJVMExceptionHandler.class);
 
     @Override
     public void uncaughtException(Thread t, Throwable e) {

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
index 282b3b8..0480b22 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
@@ -64,7 +64,6 @@ import org.apache.hedwig.server.persistence.ScanCallback;
 import org.apache.hedwig.server.persistence.ScanRequest;
 import org.apache.hedwig.server.topics.TopicManager;
 import org.apache.hedwig.util.Callback;
-import static org.apache.hedwig.util.VarArgs.va;
 
 public class FIFODeliveryManager implements DeliveryManager, SubChannelDisconnectedListener {
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java
index d10dbf7..6df70a3 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java
@@ -20,7 +20,6 @@ package org.apache.hedwig.server.handlers;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 
 import com.google.protobuf.ByteString;
@@ -52,10 +51,9 @@ import org.apache.hedwig.server.subscriptions.SubscriptionManager;
 import org.apache.hedwig.server.subscriptions.AllToAllTopologyFilter;
 import org.apache.hedwig.server.topics.TopicManager;
 import org.apache.hedwig.util.Callback;
-import static org.apache.hedwig.util.VarArgs.va;
 
 public class SubscribeHandler extends BaseHandler {
-    static Logger logger = LoggerFactory.getLogger(SubscribeHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SubscribeHandler.class);
 
     private final DeliveryManager deliveryMgr;
     private final PersistenceManager persistenceMgr;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscriptionChannelManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscriptionChannelManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscriptionChannelManager.java
index 5b1d85d..3481d81 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscriptionChannelManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscriptionChannelManager.java
@@ -33,12 +33,11 @@ import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubResponse;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionEvent;
 import org.apache.hedwig.protoextensions.PubSubResponseUtils;
-import org.apache.hedwig.util.Callback;
 import static org.apache.hedwig.util.VarArgs.va;
 
 public class SubscriptionChannelManager implements ChannelDisconnectListener {
 
-    static Logger logger = LoggerFactory.getLogger(SubscriptionChannelManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(SubscriptionChannelManager.class);
 
     static class CloseSubscriptionListener implements ChannelFutureListener {
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/UnsubscribeHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/UnsubscribeHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/UnsubscribeHandler.java
index e2a59c6..3838e96 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/UnsubscribeHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/UnsubscribeHandler.java
@@ -25,7 +25,6 @@ import org.apache.hedwig.client.data.TopicSubscriber;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.protocol.PubSubProtocol.OperationType;
 import org.apache.hedwig.protocol.PubSubProtocol.PubSubRequest;
-import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionEvent;
 import org.apache.hedwig.protocol.PubSubProtocol.UnsubscribeRequest;
 import org.apache.hedwig.protoextensions.PubSubResponseUtils;
 import org.apache.hedwig.server.common.ServerConfiguration;
@@ -36,7 +35,6 @@ import org.apache.hedwig.server.netty.UmbrellaHandler;
 import org.apache.hedwig.server.subscriptions.SubscriptionManager;
 import org.apache.hedwig.server.topics.TopicManager;
 import org.apache.hedwig.util.Callback;
-import static org.apache.hedwig.util.VarArgs.va;
 
 public class UnsubscribeHandler extends BaseHandler {
     SubscriptionManager subMgr;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/meta/FactoryLayout.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/FactoryLayout.java b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/FactoryLayout.java
index 6c61a2f..a4253f8 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/FactoryLayout.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/FactoryLayout.java
@@ -44,7 +44,7 @@ import static com.google.common.base.Charsets.UTF_8;
  *
  */
 public class FactoryLayout {
-    static final Logger logger = LoggerFactory.getLogger(FactoryLayout.class);
+    private static final Logger logger = LoggerFactory.getLogger(FactoryLayout.class);
 
     // metadata manager name
     public static final String NAME = "METADATA";

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/meta/MetadataManagerFactory.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/MetadataManagerFactory.java b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/MetadataManagerFactory.java
index b1591aa..129d03d 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/MetadataManagerFactory.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/MetadataManagerFactory.java
@@ -36,7 +36,7 @@ import com.google.protobuf.ByteString;
  */
 public abstract class MetadataManagerFactory {
 
-    static final Logger LOG = LoggerFactory.getLogger(MetadataManagerFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MetadataManagerFactory.class);
 
     /**
      * Return current factory version.

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/meta/SubscriptionDataManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/SubscriptionDataManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/SubscriptionDataManager.java
index 1333560..0bebd45 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/SubscriptionDataManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/SubscriptionDataManager.java
@@ -26,7 +26,6 @@ import org.apache.bookkeeper.versioning.Version;
 import org.apache.bookkeeper.versioning.Versioned;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionData;
-import org.apache.hedwig.server.subscriptions.InMemorySubscriptionState;
 import org.apache.hedwig.util.Callback;
 
 /**

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/meta/TopicOwnershipManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/TopicOwnershipManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/TopicOwnershipManager.java
index 15484c5..f17011c 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/TopicOwnershipManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/TopicOwnershipManager.java
@@ -18,20 +18,13 @@
 package org.apache.hedwig.server.meta;
 
 import java.io.Closeable;
-import java.io.IOException;
-import java.util.Map;
 
 import com.google.protobuf.ByteString;
 
 import org.apache.bookkeeper.versioning.Version;
 import org.apache.bookkeeper.versioning.Versioned;
-import org.apache.hedwig.protocol.PubSubProtocol.LedgerRanges;
-import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionState;
-import org.apache.hedwig.server.common.ServerConfiguration;
-import org.apache.hedwig.server.subscriptions.InMemorySubscriptionState;
 import org.apache.hedwig.server.topics.HubInfo;
 import org.apache.hedwig.util.Callback;
-import org.apache.zookeeper.ZooKeeper;
 
 /**
  * Manage topic ownership

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/meta/ZkMetadataManagerFactory.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/ZkMetadataManagerFactory.java b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/ZkMetadataManagerFactory.java
index 9b5fe08..e50bc7f 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/meta/ZkMetadataManagerFactory.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/meta/ZkMetadataManagerFactory.java
@@ -38,13 +38,11 @@ import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.bookkeeper.versioning.Version;
 import org.apache.bookkeeper.versioning.Versioned;
-import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.meta.ZkVersion;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.protocol.PubSubProtocol.LedgerRanges;
 import org.apache.hedwig.protocol.PubSubProtocol.StatusCode;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionData;
-import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionState;
 import org.apache.hedwig.protoextensions.SubscriptionStateUtils;
 import org.apache.hedwig.server.common.ServerConfiguration;
 import org.apache.hedwig.server.topics.HubInfo;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java b/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
index 94d61ad..23e04e3 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
@@ -92,7 +92,7 @@ import org.apache.hedwig.zookeeper.SafeAsyncCallback;
 
 public class PubSubServer {
 
-    static Logger logger = LoggerFactory.getLogger(PubSubServer.class);
+    private static final Logger logger = LoggerFactory.getLogger(PubSubServer.class);
 
     private static final String JMXNAME_PREFIX = "PubSubServer_";
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
index a3be99a..00a52bf 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
@@ -46,7 +46,7 @@ import org.apache.hedwig.server.handlers.Handler;
 
 @Sharable
 public class UmbrellaHandler extends SimpleChannelHandler {
-    static Logger logger = LoggerFactory.getLogger(UmbrellaHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(UmbrellaHandler.class);
 
     private final Map<OperationType, Handler> handlers;
     private final ChannelGroup allChannels;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
index d0ea5b3..b0b5a80 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
@@ -77,7 +77,7 @@ import static com.google.common.base.Charsets.UTF_8;
  */
 
 public class BookkeeperPersistenceManager implements PersistenceManagerWithRangeScan, TopicOwnershipChangeListener {
-    static Logger logger = LoggerFactory.getLogger(BookkeeperPersistenceManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(BookkeeperPersistenceManager.class);
     static byte[] passwd = "sillysecret".getBytes(UTF_8);
     private BookKeeper bk;
     private TopicPersistenceManager tpManager;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
index 942aecd..992ff11 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
@@ -33,7 +33,7 @@ import org.apache.hedwig.server.common.UnexpectedError;
  */
 public class CacheValue {
 
-    static Logger logger = LoggerFactory.getLogger(ReadAheadCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReadAheadCache.class);
 
     // Actually we don't care the order of callbacks
     // when a scan callback, it should be delivered to both callbacks

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
index 6f474c8..b3c5dc9 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
@@ -50,7 +50,7 @@ import org.apache.hedwig.util.Callback;
 import org.apache.hedwig.util.FileUtils;
 
 public class LocalDBPersistenceManager implements PersistenceManagerWithRangeScan {
-    static Logger logger = LoggerFactory.getLogger(LocalDBPersistenceManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(LocalDBPersistenceManager.class);
 
     static String connectionURL;
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
index 09abf67..2235282 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
@@ -53,7 +53,7 @@ import com.google.protobuf.ByteString;
 
 public class ReadAheadCache implements PersistenceManager, HedwigJMXService {
 
-    static Logger logger = LoggerFactory.getLogger(ReadAheadCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReadAheadCache.class);
 
     protected interface CacheRequest {
         public void performRequest();

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java
index b01f179..45272e2 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java
@@ -48,7 +48,7 @@ import org.apache.hedwig.server.netty.UmbrellaHandler;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 public class HedwigProxy {
-    static final Logger logger = LoggerFactory.getLogger(HedwigProxy.class);
+    private static final Logger logger = LoggerFactory.getLogger(HedwigProxy.class);
 
     HedwigClient client;
     ServerSocketChannelFactory serverSocketChannelFactory;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyCloseSubscriptionHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyCloseSubscriptionHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyCloseSubscriptionHandler.java
index c1ef435..13d3993 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyCloseSubscriptionHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyCloseSubscriptionHandler.java
@@ -32,7 +32,7 @@ import org.apache.hedwig.util.Callback;
 
 public class ProxyCloseSubscriptionHandler implements Handler {
 
-    static final Logger logger = LoggerFactory.getLogger(ProxyCloseSubscriptionHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProxyCloseSubscriptionHandler.class);
 
     Subscriber subscriber;
     ChannelTracker tracker;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java
index c9bfb12..c37ac48 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java
@@ -30,7 +30,7 @@ import org.apache.hedwig.server.netty.UmbrellaHandler;
 
 public class ProxyConsumeHandler implements Handler {
 
-    static final Logger logger = LoggerFactory.getLogger(ProxyConsumeHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProxyConsumeHandler.class);
 
     Subscriber subscriber;
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java
index e77fbce..d1cbb6b 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java
@@ -41,7 +41,7 @@ import org.apache.hedwig.util.Callback;
 
 public class ProxyStartDeliveryHandler implements Handler {
 
-    static final Logger logger = LoggerFactory.getLogger(ProxyStartDeliveryHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProxyStartDeliveryHandler.class);
 
     Subscriber subscriber;
     ChannelTracker tracker;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java
index 4ac23e7..f66f9f1 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java
@@ -31,7 +31,7 @@ import org.apache.hedwig.server.netty.UmbrellaHandler;
 
 public class ProxyStopDeliveryHandler implements Handler {
 
-    static final Logger logger = LoggerFactory.getLogger(ProxyStopDeliveryHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProxyStopDeliveryHandler.class);
 
     Subscriber subscriber;
     ChannelTracker tracker;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java
index 6986004..a291dad 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java
@@ -35,7 +35,7 @@ import org.apache.hedwig.util.Callback;
 
 public class ProxySubscribeHandler implements Handler, ChannelDisconnectListener {
 
-    static final Logger logger = LoggerFactory.getLogger(ProxySubscribeHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProxySubscribeHandler.class);
 
     Subscriber subscriber;
     ChannelTracker tracker;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java
index 0dcbe39..eaed39d 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java
@@ -25,16 +25,10 @@ import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import com.google.protobuf.ByteString;
-
-import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.versioning.Version;
-import org.apache.bookkeeper.versioning.Versioned;
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.protocol.PubSubProtocol.MessageSeqId;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscribeRequest;
@@ -57,7 +51,7 @@ import org.apache.hedwig.util.ConcurrencyUtils;
 
 public abstract class AbstractSubscriptionManager implements SubscriptionManager, TopicOwnershipChangeListener {
 
-    static Logger logger = LoggerFactory.getLogger(AbstractSubscriptionManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(AbstractSubscriptionManager.class);
 
     protected final ServerConfiguration cfg;
     protected final ConcurrentHashMap<ByteString, Map<ByteString, InMemorySubscriptionState>> top2sub2seq =

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
index 4fadc77..4adbf1c 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionManager.java
@@ -30,9 +30,12 @@ import org.apache.hedwig.server.delivery.DeliveryManager;
 import org.apache.hedwig.server.persistence.PersistenceManager;
 import org.apache.hedwig.server.topics.TopicManager;
 import org.apache.hedwig.util.Callback;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InMemorySubscriptionManager extends AbstractSubscriptionManager {
-    // Backup for top2sub2seq
+	 private static final Logger logger = LoggerFactory.getLogger(InMemorySubscriptionManager.class);
+	// Backup for top2sub2seq
     final ConcurrentHashMap<ByteString, Map<ByteString, InMemorySubscriptionState>> top2sub2seqBackup =
         new ConcurrentHashMap<ByteString, Map<ByteString, InMemorySubscriptionState>>();
 

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionState.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionState.java b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionState.java
index 05c4a03..ea74599 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionState.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/InMemorySubscriptionState.java
@@ -17,11 +17,9 @@
  */
 package org.apache.hedwig.server.subscriptions;
 
-import java.util.HashMap;
-import java.util.Map;
 
+import java.util.Map;
 import com.google.protobuf.ByteString;
-
 import org.apache.bookkeeper.versioning.Version;
 import org.apache.hedwig.protocol.PubSubProtocol.MessageSeqId;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionData;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/MMSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/MMSubscriptionManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/MMSubscriptionManager.java
index 1261558..47fdfd2 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/MMSubscriptionManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/MMSubscriptionManager.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 
 import com.google.protobuf.ByteString;
+
 import org.apache.hedwig.exceptions.PubSubException;
 import org.apache.hedwig.protocol.PubSubProtocol.SubscriptionData;
 import org.apache.hedwig.server.common.ServerConfiguration;
@@ -34,13 +35,16 @@ import org.apache.hedwig.server.topics.TopicManager;
 import org.apache.hedwig.util.Callback;
 import org.apache.bookkeeper.versioning.Version;
 import org.apache.bookkeeper.versioning.Versioned;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * MetaManager-based subscription manager.
  */
 public class MMSubscriptionManager extends AbstractSubscriptionManager {
 
-    SubscriptionDataManager subManager;
+	private static final Logger logger = LoggerFactory.getLogger(MMSubscriptionManager.class);
+	SubscriptionDataManager subManager;
 
     public MMSubscriptionManager(ServerConfiguration cfg,
                                  MetadataManagerFactory metaManagerFactory,

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/topics/MMTopicManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/topics/MMTopicManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/topics/MMTopicManager.java
index 98b491b..65cc9c4 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/topics/MMTopicManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/topics/MMTopicManager.java
@@ -46,7 +46,7 @@ import com.google.protobuf.ByteString;
  */
 public class MMTopicManager extends AbstractTopicManager implements TopicManager {
 
-    static Logger logger = LoggerFactory.getLogger(MMTopicManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(MMTopicManager.class);
 
     // topic ownership manager
     private final TopicOwnershipManager mm;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java b/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java
index 12744fd..2424d27 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java
@@ -41,8 +41,6 @@ import org.apache.hedwig.util.Either;
 import org.apache.hedwig.util.HedwigSocketAddress;
 import org.apache.hedwig.zookeeper.SafeAsyncZKCallback;
 import org.apache.hedwig.zookeeper.ZkUtils;
-import org.apache.hedwig.zookeeper.SafeAsyncZKCallback.DataCallback;
-import org.apache.hedwig.zookeeper.SafeAsyncZKCallback.StatCallback;
 
 /**
  * Topics are operated on in parallel as they are independent.
@@ -50,7 +48,7 @@ import org.apache.hedwig.zookeeper.SafeAsyncZKCallback.StatCallback;
  */
 public class ZkTopicManager extends AbstractTopicManager implements TopicManager {
 
-    static Logger logger = LoggerFactory.getLogger(ZkTopicManager.class);
+    private static final Logger logger = LoggerFactory.getLogger(ZkTopicManager.class);
 
     /**
      * Persistent storage for topic metadata.

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java b/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java
index f11c416..d3dcfd6 100644
--- a/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java
+++ b/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java
@@ -33,7 +33,7 @@ import org.apache.hedwig.util.PathUtils;
 
 public class ZkUtils {
 
-    static Logger logger = LoggerFactory.getLogger(ZkUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(ZkUtils.class);
 
     static class SyncObject {
         int rc;

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java b/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java
index ecc444e..81e0314 100644
--- a/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java
+++ b/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java
@@ -41,7 +41,7 @@ import org.apache.bookkeeper.test.PortManager;
  */
 public abstract class HedwigHubTestBase extends TestCase {
 
-    protected static Logger logger = LoggerFactory.getLogger(HedwigHubTestBase.class);
+    protected static final Logger logger = LoggerFactory.getLogger(HedwigHubTestBase.class);
 
     // BookKeeper variables
     // Default number of bookie servers to setup. Extending classes can

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java b/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java
index adb4ea9..0a574b6 100644
--- a/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java
+++ b/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java
@@ -44,7 +44,7 @@ import org.apache.bookkeeper.test.PortManager;
  */
 public abstract class HedwigRegionTestBase {
 
-    protected static Logger logger = LoggerFactory.getLogger(HedwigRegionTestBase.class);
+    protected static final Logger logger = LoggerFactory.getLogger(HedwigRegionTestBase.class);
 
     // BookKeeper variables
     // Default number of bookie servers to setup. Extending classes

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/test/java/org/apache/hedwig/server/LoggingExceptionHandler.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/LoggingExceptionHandler.java b/hedwig-server/src/test/java/org/apache/hedwig/server/LoggingExceptionHandler.java
index 5e59960..5ea0990 100644
--- a/hedwig-server/src/test/java/org/apache/hedwig/server/LoggingExceptionHandler.java
+++ b/hedwig-server/src/test/java/org/apache/hedwig/server/LoggingExceptionHandler.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
  * does nothing more. To be used in tests instead of TerminateJVMExceptionHandler
  */
 public class LoggingExceptionHandler implements Thread.UncaughtExceptionHandler {
-    static Logger logger = LoggerFactory.getLogger(LoggingExceptionHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(LoggingExceptionHandler.class);
 
     @Override
     public void uncaughtException(Thread t, Throwable e) {

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java b/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java
index be5722b..02d1f46 100644
--- a/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java
+++ b/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java
@@ -34,7 +34,7 @@ import org.apache.hedwig.util.HedwigSocketAddress;
  */
 public abstract class PubSubServerStandAloneTestBase {
 
-    protected static Logger logger = LoggerFactory.getLogger(PubSubServerStandAloneTestBase.class);
+    protected static final Logger logger = LoggerFactory.getLogger(PubSubServerStandAloneTestBase.class);
 
     protected class StandAloneServerConfiguration extends ServerConfiguration {
         final int port = PortManager.nextFreePort();

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java b/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
index f4e806d..0150a11 100644
--- a/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
+++ b/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TestBackwardCompat {
 
-    private static Logger logger = LoggerFactory.getLogger(TestBackwardCompat.class);
+    private static final Logger logger = LoggerFactory.getLogger(TestBackwardCompat.class);
 
     static final int CONSUMEINTERVAL = 5;
     static ZooKeeperUtil zkUtil = new ZooKeeperUtil();

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8c1b9ebc/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
----------------------------------------------------------------------
diff --git a/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java b/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
index 1ad752a..632ea43 100644
--- a/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
+++ b/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
@@ -44,7 +44,7 @@ import org.apache.hedwig.util.FileUtils;
 
 public class TestPubSubServerStartup {
 
-    private static Logger logger = LoggerFactory.getLogger(TestPubSubServerStartup.class);
+    private static final Logger logger = LoggerFactory.getLogger(TestPubSubServerStartup.class);
 
     /**
      * Start-up zookeeper + pubsubserver reading from a config URL. Then stop


Mime
View raw message