You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/04/03 12:02:30 UTC
[commons-fileupload] 01/02: Reuse FileUtils.getTempDirectory()
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-fileupload.git
commit f885ac592ef2416156d9c9395e1e338262f2b593
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Apr 3 07:15:14 2023 -0400
Reuse FileUtils.getTempDirectory()
---
src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java | 2 +-
.../org/apache/commons/fileupload2/DiskFileItemSerializeTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
index af7646b..fd2f62a 100644
--- a/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
+++ b/src/main/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
@@ -456,7 +456,7 @@ public class DiskFileItem implements FileItem {
if (tempFile == null) {
File tempDir = repository;
if (tempDir == null) {
- tempDir = new File(System.getProperty("java.io.tmpdir"));
+ tempDir = FileUtils.getTempDirectory();
}
final String tempFileName = format("upload_%s_%s.tmp", UID, getUniqueId());
diff --git a/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java b/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
index 6bc8fab..a6565f8 100644
--- a/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
+++ b/src/test/java/org/apache/commons/fileupload2/DiskFileItemSerializeTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
public class DiskFileItemSerializeTest {
// Use a private repository to catch any files left over by tests
- private static final File REPOSITORY = new File(System.getProperty("java.io.tmpdir"), "DiskFileItemRepo");
+ private static final File REPOSITORY = new File(FileUtils.getTempDirectory(), "DiskFileItemRepo");
/**
* Content type for regular form items.
@@ -203,7 +203,7 @@ public class DiskFileItemSerializeTest {
public void testInvalidRepository() throws IOException {
// Create the FileItem
final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
- final File repository = new File(System.getProperty("java.io.tmpdir"), "file");
+ final File repository = new File(FileUtils.getTempDirectory(), "file");
final FileItem item = createFileItem(testFieldValueBytes, repository);
assertThrows(IOException.class, () -> deserialize(serialize(item)));
}
@@ -215,7 +215,7 @@ public class DiskFileItemSerializeTest {
public void testInvalidRepositoryWithNullChar() throws IOException {
// Create the FileItem
final byte[] testFieldValueBytes = createContentBytes(THRESHOLD);
- final File repository = new File(System.getProperty("java.io.tmpdir"), "\0");
+ final File repository = new File(FileUtils.getTempDirectory(), "\0");
final FileItem item = createFileItem(testFieldValueBytes, repository);
assertThrows(IOException.class, () -> deserialize(serialize(item)));
}