From 49cb4c13b362bda073c5d34fa39466357baa5eb8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 30 Jun 2008 03:08:16 +0000
Subject: [PATCH]     * PersistentDataStore: More leaseSet code cleanup

---
 .../kademlia/PersistentDataStore.java         | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 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 fb62d8a5b4..66431b85ee 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -451,8 +451,18 @@ class PersistentDataStore extends TransientDataStore {
     }
     
     private void removeFile(Hash key, File dir) throws IOException {
-        String lsName = getLeaseSetName(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);
         if (f.exists()) {
             boolean removed = f.delete();
@@ -462,17 +472,10 @@ class PersistentDataStore extends TransientDataStore {
                 _log.info("Removed lease set at " + f.getAbsolutePath());
             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 static final FilenameFilter _instance = new LeaseSetFilter();
         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()));
         }
     }
+***/
     private final static class RouterInfoFilter implements FilenameFilter {
         private static final FilenameFilter _instance = new RouterInfoFilter();
         public static final FilenameFilter getInstance() { return _instance; }