zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* PersistentDataStore: More leaseSet code cleanup

Browse Source
This commit is contained in:
zzz
2008-06-30 03:08:16 +00:00
parent 28da17276c
commit 49cb4c13b3
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
View File

@@ -451,8 +451,18 @@ class PersistentDataStore extends TransientDataStore {
} }
private void removeFile(Hash key, File dir) throws IOException { private void removeFile(Hash key, File dir) throws IOException {
String lsName = getLeaseSetName(key);
String riName = getRouterInfoName(key); String riName = getRouterInfoName(key);
File f = new File(dir, riName);
if (f.exists()) {
boolean removed = f.delete();
if (!removed)
_log.warn("Unable to remove router info at " + f.getAbsolutePath());
else
_log.info("Removed router info at " + f.getAbsolutePath());
return;
}
/***
String lsName = getLeaseSetName(key);
File f = new File(dir, lsName); File f = new File(dir, lsName);
if (f.exists()) { if (f.exists()) {
boolean removed = f.delete(); boolean removed = f.delete();
@@ -462,17 +472,10 @@ class PersistentDataStore extends TransientDataStore {
_log.info("Removed lease set at " + f.getAbsolutePath()); _log.info("Removed lease set at " + f.getAbsolutePath());
return; return;
} }
f = new File(dir, riName); ***/
if (f.exists()) {
boolean removed = f.delete();
if (!removed)
_log.warn("Unable to remove router info at " + f.getAbsolutePath());
else
_log.info("Removed router info at " + f.getAbsolutePath());
return;
}
} }
/***
private final static class LeaseSetFilter implements FilenameFilter { private final static class LeaseSetFilter implements FilenameFilter {
private static final FilenameFilter _instance = new LeaseSetFilter(); private static final FilenameFilter _instance = new LeaseSetFilter();
public static final FilenameFilter getInstance() { return _instance; } public static final FilenameFilter getInstance() { return _instance; }
@@ -482,6 +485,7 @@ class PersistentDataStore extends TransientDataStore {
return (name.startsWith(LEASESET_PREFIX.toUpperCase()) && name.endsWith(LEASESET_SUFFIX.toUpperCase())); return (name.startsWith(LEASESET_PREFIX.toUpperCase()) && name.endsWith(LEASESET_SUFFIX.toUpperCase()));
} }
} }
***/
private final static class RouterInfoFilter implements FilenameFilter { private final static class RouterInfoFilter implements FilenameFilter {
private static final FilenameFilter _instance = new RouterInfoFilter(); private static final FilenameFilter _instance = new RouterInfoFilter();
public static final FilenameFilter getInstance() { return _instance; } public static final FilenameFilter getInstance() { return _instance; }