zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p.tuna.tmp' (head 1bba286bdb7f8ba879c4db3f356676151674a201)

Browse Source 
to branch 'i2p.i2p' (head 5698b31632398b8156a3b4cc215fed677cf205bf)
This commit is contained in:
dev
2015-04-15 16:08:29 +00:00
parent 54dba980b4 de6608f6b8
commit b31ae4bae5
161 changed files with 33674 additions and 25999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/src/freenet/support/CPUInformation/IntelInfoImpl.java
View File

@@ -156,9 +156,8 @@ class IntelInfoImpl extends CPUIDCPUInfo implements IntelCPUInfo
isPentiumMCompatible = true;
isCore2Compatible = true;
isX64 = true;
}
if (extmodel >= 2) {
isCoreiCompatible = true;
if (extmodel >= 2)
isCoreiCompatible = true;
}
switch (model) {
case 0:

2
core/java/src/net/i2p/CoreVersion.java
View File

@@ -18,7 +18,7 @@ public class CoreVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = "0.9.18";
public final static String VERSION = "0.9.19";
/**
* For Vuze.

3
core/java/src/net/i2p/crypto/SHA256Generator.java
View File

@@ -77,8 +77,9 @@ public final class SHA256Generator {
digest.digest(out, outOffset, Hash.HASH_LENGTH);
} catch (DigestException e) {
throw new RuntimeException(e);
} finally {
release(digest);
}
release(digest);
}
private MessageDigest acquire() {

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

@@ -74,6 +74,9 @@ class LogWriter extends LogWriterBase {
}
}
/**
* @since 0.9.19
*/
protected void flushWriter() {
try {
if (_currentOut != null)
@@ -84,6 +87,9 @@ class LogWriter extends LogWriterBase {
}
}
/**
* @since 0.9.19 renamed from closeFile()
*/
protected void closeWriter() {
Writer out = _currentOut;
if (out != null) {

1
core/java/src/net/i2p/util/LogWriterBase.java
View File

@@ -16,6 +16,7 @@ import java.util.Queue;
* the log. This also periodically instructs the LogManager to reread its config
* file.
*
* @since 0.9.19 pulled from LogWriter so Android may extend
*/
abstract class LogWriterBase implements Runnable {
/** every 10 seconds? why? Just have the gui force a reread after a change?? */

9
core/java/src/net/i2p/util/NativeBigInteger.java
View File

@@ -196,15 +196,14 @@ public class NativeBigInteger extends BigInteger {
private final static String sCPUType; //The CPU Type to optimize for (one of the above strings)
static {
if (_isX86) {// Don't try to resolve CPU type on non x86 hardware
if (_isX86) { // Don't try to resolve CPU type on non x86 hardware
sCPUType = resolveCPUType();
}
else if (_isArm) {
} else if (_isArm) {
sCPUType = JBIGI_OPTIMIZATION_ARM;
} else if (_isPPC && !_isMac) {
sCPUType = JBIGI_OPTIMIZATION_PPC;
sCPUType = JBIGI_OPTIMIZATION_PPC;
} else {
sCPUType = null;
sCPUType = null;
}
loadNative();
}