From ca7f15aeb74bc358381c6b718df2434b65509378 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 27 Nov 2019 08:58:20 -0800 Subject: [PATCH] Catch file exceptions in CameraConfig and ConfigManager --- .../java/com/chameleonvision/config/CameraConfig.java | 10 ++++++++-- .../java/com/chameleonvision/config/ConfigManager.java | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Main/src/main/java/com/chameleonvision/config/CameraConfig.java b/Main/src/main/java/com/chameleonvision/config/CameraConfig.java index 5d0d5fbd3..57d37d559 100644 --- a/Main/src/main/java/com/chameleonvision/config/CameraConfig.java +++ b/Main/src/main/java/com/chameleonvision/config/CameraConfig.java @@ -4,6 +4,7 @@ import com.chameleonvision.util.JacksonHelper; import com.chameleonvision.vision.pipeline.CVPipelineSettings; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -94,8 +95,13 @@ public class CameraConfig { private void checkFolder() { if (!folderExists()) { - if (!(new File(getFolderPath().toUri()).mkdirs())) { - System.err.println("Failed to create camera config folder: " + getFolderPath().toString()); + try { + if (!(new File(getFolderPath().toUri()).mkdirs())) { + System.err.println("Failed to create camera config folder: " + getFolderPath().toString()); + } + } catch(Exception e) { + if(!(e instanceof java.nio.file.FileAlreadyExistsException || e instanceof java.nio.file.FileAlreadyExistsException)) + System.err.println("Failed to create camera config folder: " + getFolderPath().toString()); } } } diff --git a/Main/src/main/java/com/chameleonvision/config/ConfigManager.java b/Main/src/main/java/com/chameleonvision/config/ConfigManager.java index a5e442986..4aff1fb18 100644 --- a/Main/src/main/java/com/chameleonvision/config/ConfigManager.java +++ b/Main/src/main/java/com/chameleonvision/config/ConfigManager.java @@ -32,7 +32,8 @@ public class ConfigManager { new File(SettingsPath.toUri()).mkdirs(); Files.createDirectory(SettingsPath); } catch (IOException e) { - e.printStackTrace(); + if(!(e instanceof java.nio.file.FileAlreadyExistsException || e instanceof java.nio.file.FileAlreadyExistsException)) + e.printStackTrace(); } } }