From dca5e9889aa6574342f720d401f5685c8b069465 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 7 May 2013 13:49:31 +0000
Subject: [PATCH] finals
---
.../networkdb/kademlia/PersistentDataStore.java | 2 --
.../networkdb/kademlia/TransientDataStore.java | 13 ++++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
index deb99336a8..411e112156 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -42,7 +42,6 @@ import net.i2p.util.SecureFileOutputStream;
*
*/
class PersistentDataStore extends TransientDataStore {
- private final Log _log;
private final File _dbDir;
private final KademliaNetworkDatabaseFacade _facade;
private final Writer _writer;
@@ -60,7 +59,6 @@ class PersistentDataStore extends TransientDataStore {
*/
public PersistentDataStore(RouterContext ctx, String dbDir, KademliaNetworkDatabaseFacade facade) throws IOException {
super(ctx);
- _log = ctx.logManager().getLog(PersistentDataStore.class);
_flat = ctx.getBooleanProperty(PROP_FLAT);
_dbDir = getDbDir(dbDir);
_facade = facade;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java
index cd4b37c042..d3158798db 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/TransientDataStore.java
@@ -22,14 +22,17 @@ import net.i2p.data.RouterInfo;
import net.i2p.router.RouterContext;
import net.i2p.util.Log;
+/**
+ * Stores in-memory only. See extension.
+ */
class TransientDataStore implements DataStore {
- private Log _log;
- private ConcurrentHashMap<Hash, DatabaseEntry> _data;
- protected RouterContext _context;
+ protected final Log _log;
+ private final ConcurrentHashMap<Hash, DatabaseEntry> _data;
+ protected final RouterContext _context;
public TransientDataStore(RouterContext ctx) {
_context = ctx;
- _log = ctx.logManager().getLog(TransientDataStore.class);
+ _log = ctx.logManager().getLog(getClass());
_data = new ConcurrentHashMap(1024);
if (_log.shouldLog(Log.INFO))
_log.info("Data Store initialized");
@@ -191,7 +194,7 @@ class TransientDataStore implements DataStore {
public DatabaseEntry remove(Hash key) {
if (_log.shouldLog(Log.DEBUG))
- _log.debug("Removing key " + key.toBase64());
+ _log.debug("Removing key " + key);
return _data.remove(key);
}
}
--
GitLab