Changeset 50578b3


Ignore:
Timestamp:
Jun 10, 2011 10:03:34 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
47632a3
Parents:
c8afe4b
Message:
  • Profiles: Skip and delete a corrupt profile read from disk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    rc8afe4b r50578b3  
     12011-06-10 zzz
     2    * CPUID, NativeBigI: Add support for atom, core2, corei, nano, pentiumm, geode
     3    * Random: Add config setting prng.bufferSize to override the default 256 KB
     4    * JBigI:
     5      - Add new libjbigi-linux-xxx.so files built by sponge, now that we have
     6        CPUID.java support for them (thanks hottuna).
     7        See http://zzz.i2p/topics/306 for discussion and test results.
     8
     9        64-bit processors (atom, core2, corei, nano):
     10        Built with GMP 5.0.2. License is LGPLv3.
     11        Built by sponge with GCC 4.4.4, downloaded from
     12        http://sponge.i2p/files/jbigi/gmp-5.0.2/
     13        For 64-bit processors, both performance testing and
     14        the GMP changelog http://gmplib.org/gmp5.0.html led us to use 5.0.2
     15        for both the 32- and 64-bit versions, even though the files are twice as big.
     16        5.0.x contains specific optimizations for atom and nano.
     17        All 64-bit libs have _64 appended.
     18
     19        32-bit processors (pentiumm, geode):
     20        Built with GMP 4.3.2. License is LGPLv3.
     21        Built by sponge with GCC 4.4.4, downloaded from
     22        http://sponge.i2p/files/jbigi/gmp-4.3.2/
     23        The 4.3.2 files are half the size of those built with GMP 5.0.2, and there was
     24        little or no performance difference between the two versions for 32 bit processors.
     25    * Profiles: Skip and delete a corrupt profile read from disk
     26
    1272011-06-10 kytv
    228   * jcpuid & jbigi added for 64bit Windows (only used with a 64bit jvm).
  • router/java/src/net/i2p/router/RouterVersion.java

    rc8afe4b r50578b3  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 22;
     21    public final static long BUILD = 23;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java

    rc8afe4b r50578b3  
    270270           
    271271            return profile;
    272         } catch (IllegalArgumentException iae) {
    273             _log.error("Error loading profile from " +file.getName(), iae);
     272        } catch (Exception e) {
     273            if (_log.shouldLog(Log.WARN))
     274                _log.warn("Error loading properties from " + file.getAbsolutePath(), e);
    274275            file.delete();
    275276            return null;
     
    301302    }
    302303   
    303     private void loadProps(Properties props, File file) {
     304    private void loadProps(Properties props, File file) throws IOException {
    304305        InputStream fin = null;
    305306        try {
     
    319320                DataHelper.loadProps(props, new GZIPInputStream(fin));
    320321            }
    321         } catch (IOException ioe) {
    322             if (_log.shouldLog(Log.WARN))
    323                 _log.warn("Error loading properties from " + file.getName(), ioe);
    324322        } finally {
    325323            try {
Note: See TracChangeset for help on using the changeset viewer.