I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2005-08-17 jrandom

Browse Source 
* Revise the SSU peer testing protocol so that Bob verifies Charlie's
      viability before agreeing to Alice's request.  This doesn't work with
      older SSU peer test builds, but is backwards compatible (older nodes
      won't ask newer nodes to participate in tests, and newer nodes won't
      ask older nodes to either).
This commit is contained in:
jrandom
2005-08-17 20:05:01 +00:00
committed by zzz
parent cade27dceb
commit 11204b8a2b
11 changed files with 444 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/src/net/i2p/data/Base64.java
View File

@ -44,19 +44,19 @@ public class Base64 {
/** added by aum */
public static String encode(String source) {
return encode(source.getBytes());
return (source != null ? encode(source.getBytes()) : "");
}
public static String encode(byte[] source) {
return encode(source, 0, (source != null ? source.length : 0));
return (source != null ? encode(source, 0, (source != null ? source.length : 0)) : "");
}
public static String encode(byte[] source, int off, int len) {
return encode(source, off, len, false);
return (source != null ? encode(source, off, len, false) : "");
}
public static String encode(byte[] source, boolean useStandardAlphabet) {
return encode(source, 0, (source != null ? source.length : 0), useStandardAlphabet);
return (source != null ? encode(source, 0, (source != null ? source.length : 0), useStandardAlphabet) : "");
}
public static String encode(byte[] source, int off, int len, boolean useStandardAlphabet) {
return safeEncode(source, off, len, useStandardAlphabet);
return (source != null ? safeEncode(source, off, len, useStandardAlphabet) : "");
}
public static byte[] decode(String s) {

2
core/java/src/net/i2p/util/LogManager.java
View File

@ -642,7 +642,7 @@ public class LogManager {
public void shutdown() {
_log.log(Log.WARN, "Shutting down logger");
_writer.flushRecords();
_writer.flushRecords(false);
}
private static int __id = 0;

13
core/java/src/net/i2p/util/LogWriter.java
View File

@ -59,7 +59,8 @@ class LogWriter implements Runnable {
}
}
public void flushRecords() {
public void flushRecords() { flushRecords(true); }
public void flushRecords(boolean shouldWait) {
try {
List records = _manager._removeAll();
if (records == null) return;
@ -77,11 +78,13 @@ class LogWriter implements Runnable {
} catch (Throwable t) {
t.printStackTrace();
} finally {
try {
synchronized (this) {
this.wait(10*1000);
if (shouldWait) {
try {
synchronized (this) {
this.wait(10*1000);
}
} catch (InterruptedException ie) { // nop
}
} catch (InterruptedException ie) { // nop
}
}
}