Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

skipping temp. dir creation when removing temp. files #1598

Closed
wants to merge 2 commits into from
Closed

skipping temp. dir creation when removing temp. files #1598

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e18dd48
skipping temp. dir creation when removing temp. files
trespasserw Mar 28, 2024
da2b488
Merge branch 'java-native-access:master' into master
trespasserw Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions src/com/sun/jna/Native.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,11 +1315,17 @@ static void markTemporaryFile(File file) {
Override with <code>jna.tmpdir</code>
*/
static File getTempDir() throws IOException {
return getTempDir(true);
}

private static File getTempDir(boolean create) throws IOException {
File jnatmp;
String prop = System.getProperty("jna.tmpdir");
if (prop != null) {
jnatmp = new File(prop);
jnatmp.mkdirs();
if (create) {
jnatmp.mkdirs();
}
}
else {
File tmp = new File(System.getProperty("java.io.tmpdir"));
Expand All @@ -1344,23 +1350,29 @@ static File getTempDir() throws IOException {
jnatmp = new File(tmp, "jna-" + System.getProperty("user.name").hashCode());
}

jnatmp.mkdirs();
if (!jnatmp.exists() || !jnatmp.canWrite()) {
jnatmp = tmp;
if (create) {
jnatmp.mkdirs();
if (!jnatmp.exists() || !jnatmp.canWrite()) {
jnatmp = tmp;
}
}
}
if (!jnatmp.exists()) {
throw new IOException("JNA temporary directory '" + jnatmp + "' does not exist");
}
if (!jnatmp.canWrite()) {
throw new IOException("JNA temporary directory '" + jnatmp + "' is not writable");

if (create) {
if (!jnatmp.exists()) {
throw new IOException("JNA temporary directory '" + jnatmp + "' does not exist");
}
if (!jnatmp.canWrite()) {
throw new IOException("JNA temporary directory '" + jnatmp + "' is not writable");
}
}

return jnatmp;
}

/** Remove all marked temporary files in the given directory. */
static void removeTemporaryFiles() throws IOException {
File dir = getTempDir();
File dir = getTempDir(false);
FilenameFilter filter = new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
Expand Down
Loading