Changeset 7aa68c0


Ignore:
Timestamp:
May 2, 2019 10:41:50 PM (13 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
8453c5cc
Parents:
811d1cc (diff), 52b14142 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '884fdac5153dc99fad97b61b1ef1172d8f0c09a9'

and 'c88b4076c5928a0e87d073abc0c0c94a341c921e'

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    r811d1cc r7aa68c0  
    112019-05-02 zzz
     2 * Android: Catch ISE from PRNG at shutdown (ticket #2077)
    23 * GeoIP Maxmind 2019-04-29
    34 * NTCP: Rare EventPumper 100% CPU fix (ticket #2476)
  • router/java/src/net/i2p/router/RouterVersion.java

    r811d1cc r7aa68c0  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 11;
     21    public final static long BUILD = 12;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java

    r811d1cc r7aa68c0  
    488488
    489489        public void run() {
     490            try {
     491                run2();
     492            } catch (IllegalStateException ise) {
     493                if (_isRunning)
     494                    throw ise;
     495                // else ignore, thread can be slow to shutdown on Android,
     496                // PRNG gets stopped first and throws ISE
     497            }
     498        }
     499
     500        private void run2() {
    490501            _isRunning = true;
    491502            while (_isRunning) {
  • router/java/src/net/i2p/router/transport/crypto/X25519KeyFactory.java

    r811d1cc r7aa68c0  
    7878
    7979    public void run() {
     80        try {
     81            run2();
     82        } catch (IllegalStateException ise) {
     83            if (_isRunning)
     84                throw ise;
     85            // else ignore, thread can be slow to shutdown on Android,
     86            // PRNG gets stopped first and throws ISE
     87        }
     88    }
     89
     90    private void run2() {
    8091        _isRunning = true;
    8192        while (_isRunning) {
Note: See TracChangeset for help on using the changeset viewer.