Skip to content

Commit 536dd29

Browse files
committed
Adjust for empty key in PathUtils.getPath(String, String)
1 parent 9842fd2 commit 536dd29

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/main/java/org/apache/commons/io/file/PathUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ private static Path getParent(final Path path) {
11051105
* @since 2.21.0
11061106
*/
11071107
public static Path getPath(final String key, final String defaultPath) {
1108-
final String property = System.getProperty(Objects.toString(key, defaultPath), defaultPath);
1108+
final String property = key != null && !key.isEmpty() ? System.getProperty(key, defaultPath) : defaultPath;
11091109
return property != null ? Paths.get(property) : null;
11101110
}
11111111

src/test/java/org/apache/commons/io/file/PathUtilsTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ void testGetPath() {
361361
assertEquals(value, PathUtils.getPath(invalidKey, value.toString()));
362362
assertNull(PathUtils.getPath(invalidKey, null));
363363
assertEquals(value, PathUtils.getPath(null, value.toString()));
364+
assertEquals(value, PathUtils.getPath("", value.toString()));
364365
}
365366

366367
@Test

0 commit comments

Comments
 (0)