* Profiles: Skip and delete a corrupt profile read from disk

history.txt

@@ -1,3 +1,29 @@
+2011-06-10 zzz
+    * CPUID, NativeBigI: Add support for atom, core2, corei, nano, pentiumm, geode
+    * Random: Add config setting prng.bufferSize to override the default 256 KB
+    * JBigI:
+      - Add new libjbigi-linux-xxx.so files built by sponge, now that we have
+        CPUID.java support for them (thanks hottuna).
+        See http://zzz.i2p/topics/306 for discussion and test results.
+
+        64-bit processors (atom, core2, corei, nano):
+        Built with GMP 5.0.2. License is LGPLv3.
+        Built by sponge with GCC 4.4.4, downloaded from
+        http://sponge.i2p/files/jbigi/gmp-5.0.2/
+        For 64-bit processors, both performance testing and
+        the GMP changelog http://gmplib.org/gmp5.0.html led us to use 5.0.2
+        for both the 32- and 64-bit versions, even though the files are twice as big.
+        5.0.x contains specific optimizations for atom and nano.
+        All 64-bit libs have _64 appended.
+
+        32-bit processors (pentiumm, geode):
+        Built with GMP 4.3.2. License is LGPLv3.
+        Built by sponge with GCC 4.4.4, downloaded from
+        http://sponge.i2p/files/jbigi/gmp-4.3.2/
+        The 4.3.2 files are half the size of those built with GMP 5.0.2, and there was
+        little or no performance difference between the two versions for 32 bit processors.
+    * Profiles: Skip and delete a corrupt profile read from disk
+
 2011-06-10 kytv
    * jcpuid & jbigi added for 64bit Windows (only used with a 64bit jvm).
 

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 22;
+    public final static long BUILD = 23;
 
     /** for example "-test" */
     public final static String EXTRA = "";

router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java

@@ -269,8 +269,9 @@ class ProfilePersistenceHelper {
                 _log.debug("Loaded the profile for " + peer.toBase64() + " from " + file.getName());
             
             return profile;
-        } catch (IllegalArgumentException iae) {
+        } catch (Exception e) {
-            _log.error("Error loading profile from " +file.getName(), iae);
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Error loading properties from " + file.getAbsolutePath(), e);
             file.delete();
             return null;
         }
@@ -300,7 +301,7 @@ class ProfilePersistenceHelper {
         return 0.0;
     }
     
-    private void loadProps(Properties props, File file) {
+    private void loadProps(Properties props, File file) throws IOException {
         InputStream fin = null;
         try {
             fin = new BufferedInputStream(new FileInputStream(file), 1);
@@ -318,9 +319,6 @@ class ProfilePersistenceHelper {
                     _log.info("Loading compressed profile data from " + file.getName());
                 DataHelper.loadProps(props, new GZIPInputStream(fin));
             }
-        } catch (IOException ioe) {
-            if (_log.shouldLog(Log.WARN))
-                _log.warn("Error loading properties from " + file.getName(), ioe);
         } finally {
             try {
                 if (fin != null) fin.close();