BOOKKEEPER-925: Fix FindBugs discovered issues in master
Author: Matteo Merli <mmerli@apache.org>
Reviewers: Siddharth Boobna <siddharth.boobna@gmail.com>, Guo Sijie <sijie@apache.org>
Closes #39 from merlimat/bk-925
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
index 7d49a6a..df31bf2 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
@@ -458,7 +458,8 @@
while (entries.hasNext()) {
LedgerEntry entry = entries.next();
HexDump.dump(entry.getEntry(), 0, out, 0);
- System.out.println("Entry Id: " + entry.getEntryId() + ", Data: " + new String(out.toByteArray()));
+ System.out.println(
+ "Entry Id: " + entry.getEntryId() + ", Data: " + new String(out.toByteArray(), UTF_8));
out.reset();
}
} catch (Exception e) {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
index 05cd958..c422a89 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
@@ -212,13 +212,13 @@
try {
ZkLedgerUnderreplicationManager.releaseUnderreplicatedLedgerLock(zk, zkLedgersRootPath,
ledgerId);
- } catch (Exception e) {
- LOG.error("Error removing underreplicated lock for ledger {}", ledgerId, e);
+ } catch (Throwable t) {
+ LOG.error("Exception when removing underreplicated lock for ledger {}", ledgerId, t);
}
}
});
- } catch (Exception e) {
- LOG.error("Exception when iterating through the ledgers to check for over-replication", e);
+ } catch (Throwable t) {
+ LOG.error("Exception when iterating through the ledgers to check for over-replication", t);
latch.countDown();
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
index 0142827..1e49cf8 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookieWatcher.java
@@ -62,7 +62,6 @@
public static int ZK_CONNECT_BACKOFF_SEC = 1;
private static final Set<BookieSocketAddress> EMPTY_SET = new HashSet<BookieSocketAddress>();
- private static final Boolean BOOLEAN = new Boolean(true);
// Bookie registration path in ZK
private final String bookieRegistrationPath;
@@ -302,7 +301,7 @@
*/
public void quarantineBookie(BookieSocketAddress bookie) {
if (quarantinedBookies.getIfPresent(bookie) == null) {
- quarantinedBookies.put(bookie, BOOLEAN);
+ quarantinedBookies.put(bookie, Boolean.TRUE);
logger.warn("Bookie {} has been quarantined because of read/write errors.", bookie);
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
index c49c5a2..363b517 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java
@@ -78,7 +78,7 @@
static final String LAYOUT="BASIC";
static final int LAYOUT_VERSION=1;
- public static final byte[] LOCK_DATA = getLockData();
+ private static final byte[] LOCK_DATA = getLockData();
private static class Lock {
private final String lockZNode;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
index ab49da7..dd51a68 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/AuthHandler.java
@@ -274,7 +274,7 @@
public void writeRequested(ChannelHandlerContext ctx,
MessageEvent e)
throws Exception {
- synchronized (waitingForAuth) {
+ synchronized (this) {
if (authenticated) {
super.writeRequested(ctx, e);
} else if (e.getMessage() instanceof BookkeeperProtocol.Request) {
@@ -339,7 +339,7 @@
@Override
public void operationComplete(int rc, Void v) {
if (rc == BKException.Code.OK) {
- synchronized (waitingForAuth) {
+ synchronized (this) {
authenticated = true;
MessageEvent e = waitingForAuth.poll();
while (e != null) {
