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

merge of '0ab9435836f60e748b89344771eea555219e6262'

Browse Source 
and '13180c845a0d2cce619be3b9b139295f2ff49ece'
This commit is contained in:
kytv
2011-05-25 17:09:29 +00:00
parent 2accbdcf05 552608744d
commit 9a836ed072
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
core/java/src/freenet/support/CPUInformation/CPUID.java
View File

@@ -612,24 +612,37 @@ public class CPUID {
*
*/
private static final boolean loadFromResource() {
URL resource = null;
// try 64 bit first, if getResourceName64() returns non-null
String resourceName = getResourceName64();
if (resourceName != null)
resource = CPUID.class.getClassLoader().getResource(resourceName);
if (resourceName != null) {
boolean success = extractLoadAndCopy(resourceName);
if (success)
return true;
}
if (resource == null) {
// now try 32 bit
resourceName = getResourceName();
resource = CPUID.class.getClassLoader().getResource(resourceName);
}
// now try 32 bit
resourceName = getResourceName();
boolean success = extractLoadAndCopy(resourceName);
if (success)
return true;
if (resource == null) {
if (_doLog)
System.err.println("WARNING: Resource name [" + resourceName + "] was not found");
if (_doLog)
System.err.println("WARNING: Resource name [" + resourceName + "] was not found");
return false;
}
/**
* Extract a single resource, copy it to a temp location in the file system,
* and attempt to load it. If the load succeeds, copy it to the installation
* directory. Return value reflects only load success - copy will fail silently.
*
* @return true if it was loaded successfully, else false.
* @since 0.8.7
*/
private static final boolean extractLoadAndCopy(String resourceName) {
URL resource = CPUID.class.getClassLoader().getResource(resourceName);
if (resource == null)
return false;
}
File outFile = null;
FileOutputStream fos = null;
String filename = libPrefix + "jcpuid" + libSuffix;
@@ -652,12 +665,16 @@ public class CPUID {
+ " was not a valid library for this platform");
ule.printStackTrace();
}
if (outFile != null)
outFile.delete();
return false;
} catch (IOException ioe) {
if (_doLog) {
System.err.println("ERROR: Problem writing out the temporary native library data");
ioe.printStackTrace();
}
if (outFile != null)
outFile.delete();
return false;
} finally {
if (fos != null) {

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 6;
public final static long BUILD = 7;
/** for example "-test" */
public final static String EXTRA = "";