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

more aggressively delete the temp lib file

Browse Source
This commit is contained in:
jrandom
2004-09-02 05:40:25 +00:00
committed by zzz
parent 94e891880b
commit 77dde5711b
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,10 +483,11 @@ public class CPUID {
} }
File outFile = null; File outFile = null;
FileOutputStream fos = null;
try { try {
InputStream libStream = resource.openStream(); InputStream libStream = resource.openStream();
outFile = File.createTempFile(libPrefix + "jcpuid", "lib.tmp" + libSuffix); outFile = File.createTempFile(libPrefix + "jcpuid", "lib.tmp" + libSuffix);
FileOutputStream fos = new FileOutputStream(outFile); fos = new FileOutputStream(outFile);
byte buf[] = new byte[4096*1024]; byte buf[] = new byte[4096*1024];
while (true) { while (true) {
int read = libStream.read(buf); int read = libStream.read(buf);
@ -494,6 +495,7 @@ public class CPUID {
fos.write(buf, 0, read); fos.write(buf, 0, read);
} }
fos.close(); fos.close();
fos = null;
System.load(outFile.getAbsolutePath());//System.load requires an absolute path to the lib System.load(outFile.getAbsolutePath());//System.load requires an absolute path to the lib
return true; return true;
} catch (UnsatisfiedLinkError ule) { } catch (UnsatisfiedLinkError ule) {
@ -510,8 +512,12 @@ public class CPUID {
} }
return false; return false;
} finally { } finally {
if (fos != null) {
try { fos.close(); } catch (IOException ioe) {}
}
if (outFile != null) { if (outFile != null) {
outFile.deleteOnExit(); if (!outFile.delete())
outFile.deleteOnExit();
} }
} }
} }

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

@ -482,10 +482,11 @@ public class NativeBigInteger extends BigInteger {
} }
File outFile = null; File outFile = null;
FileOutputStream fos = null;
try { try {
InputStream libStream = resource.openStream(); InputStream libStream = resource.openStream();
outFile = File.createTempFile(_libPrefix + "jbigi", "lib.tmp" + _libSuffix); outFile = File.createTempFile(_libPrefix + "jbigi", "lib.tmp" + _libSuffix);
FileOutputStream fos = new FileOutputStream(outFile); fos = new FileOutputStream(outFile);
byte buf[] = new byte[4096*1024]; byte buf[] = new byte[4096*1024];
while (true) { while (true) {
int read = libStream.read(buf); int read = libStream.read(buf);
@ -493,6 +494,7 @@ public class NativeBigInteger extends BigInteger {
fos.write(buf, 0, read); fos.write(buf, 0, read);
} }
fos.close(); fos.close();
fos = null;
System.load(outFile.getAbsolutePath()); //System.load requires an absolute path to the lib System.load(outFile.getAbsolutePath()); //System.load requires an absolute path to the lib
return true; return true;
} catch (UnsatisfiedLinkError ule) { } catch (UnsatisfiedLinkError ule) {
@ -509,8 +511,12 @@ public class NativeBigInteger extends BigInteger {
} }
return false; return false;
} finally { } finally {
if (fos != null) {
try { fos.close(); } catch (IOException ioe) {}
}
if (outFile != null) { if (outFile != null) {
outFile.deleteOnExit(); if (!outFile.delete())
outFile.deleteOnExit();
} }
} }
} }