Changeset 41fc9cf

Timestamp:

Mar 11, 2011 1:11:18 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

b048b01

Parents:

7edbd3a

Message:

reverseLookup improvements

File:

• core/java/src/net/i2p/client/naming/SingleFileNamingService.java (modified) (3 diffs)

core/java/src/net/i2p/client/naming/SingleFileNamingService.java

@@ -98 +98 @@
     public String reverseLookup(Destination dest, Properties options) {
         String destkey = dest.toBase64();
-        Properties hosts = new Properties();
+        BufferedReader in = null;
         getReadLock();
         try {
-            DataHelper.loadProps(hosts, _file, true);
+            in = new BufferedReader(new InputStreamReader(new FileInputStream(_file), "UTF-8"), 16*1024);
+            String line = null;
+            while ( (line = in.readLine()) != null) {
+                if (line.startsWith("#"))
+                    continue;
+                if (line.indexOf('#') > 0)  // trim off any end of line comment
+                    line = line.substring(0, line.indexOf('#')).trim();
+                int split = line.indexOf('=');
+                if (split <= 0)
+                    continue;
+                if (destkey.equals(line.substring(split + 1)))
+                    return line.substring(0, split);
+            }
+            return null;
         } catch (Exception ioe) {
             if (_file.exists())
@@ -111 +124 @@
             releaseReadLock();
         }
-        Set keyset = hosts.keySet();
-        Iterator iter = keyset.iterator();
-        while (iter.hasNext()) {
-            String host = (String)iter.next();
-            String key = hosts.getProperty(host);
-            if (destkey.equals(key))
-                return host;
-        }
-        return null;
     }
 
@@ -314 +318 @@
                     line = line.substring(0, line.indexOf('#')).trim();
                 int split = line.indexOf('=');
+                if (split <= 0)
+                    continue;
                 String key = line.substring(split);
                 String b64 = line.substring(split+1);   //.trim() ??????????????