Changeset dd400bb


Ignore:
Timestamp:
Dec 22, 2016 2:13:39 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ffcd2d4
Parents:
63a2a6d
Message:

Update: Fix JVM crash and i2p.jar corruption when updating from -1

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/util/FileUtil.java

    r63a2a6d rdd400bb  
    9999
    100100    /**
     101      * Warning - do not call any new classes from here, or
     102      * update will crash the JVM.
     103      *
    101104      * @param logLevel Log.WARN, etc.
    102105      * @return true if it was copied successfully
     
    107110        ZipFile zip = null;
    108111        try {
     112            final byte buf[] = new byte[8192];
    109113            zip = new ZipFile(zipfile);
    110114            Enumeration<? extends ZipEntry> entries = zip.entries();
     
    154158                        } else {
    155159                            fos = new FileOutputStream(target);
    156                             DataHelper.copy(in, fos);
     160                            // We do NOT use DataHelper.copy() because it loads new classes
     161                            // and causes the update to crash.
     162                            //DataHelper.copy(in, fos);
     163                            int read;
     164                            while ((read = in.read(buf)) != -1) {
     165                                   fos.write(buf, 0, read);
     166                            }   
    157167                            if (logLevel <= Log.INFO)
    158168                                System.err.println("INFO: File [" + entry.getName() + "] extracted");
  • history.txt

    r63a2a6d rdd400bb  
     12016-12-22 zzz
     2 * Blocklist:
     3   - More efficiently check blocklist when receiving new RI
     4   - Check blocklist when loading RIs
     5   - Ensure blocklist is initialized before netdb
     6 * Console: Limit age of news entries displayed
     7 * Update: Fix JVM crash and i2p.jar corruption when updating from -1
     8
     92016-12-21 zzz
     10 * NTP:
     11   - Verify source address and port
     12   - Add to command line
     13   - Add KoD support (ticket #1896)
     14   - Add initial IPv6 support (ticket #1897)
     15
     162016-12-20 zzz
     17 * Build: Fix installer compile failure
     18
    1192016-12-16 zzz
    220 * Router: Synchronize graceful exit code access
  • router/java/src/net/i2p/router/RouterVersion.java

    r63a2a6d rdd400bb  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 1;
     21    public final static long BUILD = 2;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.