Author: bdelacretaz
Date: Wed Oct 10 03:41:35 2007
New Revision: 583423
URL: http://svn.apache.org/viewvc?rev=583423&view=rev
Log:
TIKA-51, Leftover temp files after running Tika tests, fixed. Also added TIKA_
prefix to all File.createTempFile() calls
Modified:
incubator/tika/trunk/CHANGES.txt
incubator/tika/trunk/src/main/java/org/apache/tika/utils/RereadableInputStream.java
incubator/tika/trunk/src/main/java/org/apache/tika/utils/Utils.java
incubator/tika/trunk/src/test/java/org/apache/tika/RereadableInputStreamTest.java
Modified: incubator/tika/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/CHANGES.txt?rev=583423&r1=583422&r2=583423&view=diff
==============================================================================
--- incubator/tika/trunk/CHANGES.txt (original)
+++ incubator/tika/trunk/CHANGES.txt Wed Oct 10 03:41:35 2007
@@ -80,3 +80,5 @@
36. TIKA-41 - Resource files occur twice in jar file. (jukka)
37. TIKA-49 - Some files have old-style license headers, fixed (Robert Burrell
Donkin & bdelacretaz)
+
+38. TIKA-51 - Leftover temp files after running Tika tests, fixed (bdelacretaz)
Modified:
incubator/tika/trunk/src/main/java/org/apache/tika/utils/RereadableInputStream.java
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/java/org/apache/tika/utils/RereadableInputStream.java?rev=583423&r1=583422&r2=583423&view=diff
==============================================================================
---
incubator/tika/trunk/src/main/java/org/apache/tika/utils/RereadableInputStream.java
(original)
+++
incubator/tika/trunk/src/main/java/org/apache/tika/utils/RereadableInputStream.java
Wed Oct 10 03:41:35 2007
@@ -241,7 +241,7 @@
if (!bufferIsInFile) {
boolean switchToFile = (size == (maxBytesInMemory));
if (switchToFile) {
- storeFile = File.createTempFile("streamstore_", ".tmp");
+ storeFile = File.createTempFile("TIKA_streamstore_", ".tmp");
bufferIsInFile = true;
storeOutputStream = new BufferedOutputStream(
new FileOutputStream(storeFile));
Modified: incubator/tika/trunk/src/main/java/org/apache/tika/utils/Utils.java
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/src/main/java/org/apache/tika/utils/Utils.java?rev=583423&r1=583422&r2=583423&view=diff
==============================================================================
--- incubator/tika/trunk/src/main/java/org/apache/tika/utils/Utils.java
(original)
+++ incubator/tika/trunk/src/main/java/org/apache/tika/utils/Utils.java Wed Oct
10 03:41:35 2007
@@ -74,7 +74,11 @@
}
InputStream isEntry = new ByteArrayInputStream(stream
.toByteArray());
- File file = File.createTempFile("tmp", "_" + entry.getName());
+ File file = File.createTempFile("TIKA_unzip_", "_" +
entry.getName());
+
+ // TODO we might want to delete the file earlier than on exit,
+ // in case Tika is used inside a long-running app
+ file.deleteOnExit();
saveInputStreamInFile(isEntry, new BufferedOutputStream(
new FileOutputStream(file)));
res.add(file);
Modified:
incubator/tika/trunk/src/test/java/org/apache/tika/RereadableInputStreamTest.java
URL:
http://svn.apache.org/viewvc/incubator/tika/trunk/src/test/java/org/apache/tika/RereadableInputStreamTest.java?rev=583423&r1=583422&r2=583423&view=diff
==============================================================================
---
incubator/tika/trunk/src/test/java/org/apache/tika/RereadableInputStreamTest.java
(original)
+++
incubator/tika/trunk/src/test/java/org/apache/tika/RereadableInputStreamTest.java
Wed Oct 10 03:41:35 2007
@@ -97,7 +97,7 @@
}
private File createTestFile() throws IOException {
- File testfile = File.createTempFile("ris_test", ".tmp");
+ File testfile = File.createTempFile("TIKA_ris_test", ".tmp");
testfile.deleteOnExit();
FileOutputStream fos = new FileOutputStream(testfile);
for (int i = 0; i < TEST_SIZE; i++) {
