Changeset 7aa68c0
- Timestamp:
- May 2, 2019 10:41:50 PM (23 months ago)
- 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. - Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
history.txt
r811d1cc r7aa68c0 1 1 2019-05-02 zzz 2 * Android: Catch ISE from PRNG at shutdown (ticket #2077) 2 3 * GeoIP Maxmind 2019-04-29 3 4 * NTCP: Rare EventPumper 100% CPU fix (ticket #2476) -
router/java/src/net/i2p/router/RouterVersion.java
r811d1cc r7aa68c0 19 19 public final static String ID = "Monotone"; 20 20 public final static String VERSION = CoreVersion.VERSION; 21 public final static long BUILD = 1 1;21 public final static long BUILD = 12; 22 22 23 23 /** for example "-test" */ -
router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
r811d1cc r7aa68c0 488 488 489 489 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() { 490 501 _isRunning = true; 491 502 while (_isRunning) { -
router/java/src/net/i2p/router/transport/crypto/X25519KeyFactory.java
r811d1cc r7aa68c0 78 78 79 79 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() { 80 91 _isRunning = true; 81 92 while (_isRunning) {
Note: See TracChangeset
for help on using the changeset viewer.