codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-10-03 15:59:52 +00:00
Code Issues Releases Wiki Activity

Decided to get catch exceptions in ModuleSettings instead of throwing them.

Browse Source
This commit is contained in:
0xNF
2012-09-21 09:56:12 -04:00
parent 45619bbd5c
commit d8d37fe406
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreUtils/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
+16 -2
View File
@@ -113,13 +113,20 @@ public class ModuleSettings {
* @return - the value associated with the setting.
* @throws IOException
*/
public static String getConfigSetting(String moduleName, String settingName) throws IOException{
public static String getConfigSetting(String moduleName, String settingName){
if(configExists(moduleName)){
try{
InputStream inputStream = new FileInputStream(getPropertyPath(moduleName));
Properties props = new Properties();
props.load(inputStream);
inputStream.close();
return props.getProperty(settingName);
}
catch(IOException e){
Logger.getLogger(ModuleSettings.class.getName()).log(Level.WARNING, "Could not read config file [" + moduleName + "]", e);
return null;
}
}
else{
@@ -135,13 +142,15 @@ public class ModuleSettings {
* @return - the map of all key:value pairs representing the settings of the config.
* @throws IOException
*/
public static Map< String, String> getConfigSettings(String moduleName) throws IOException {
public static Map< String, String> getConfigSettings(String moduleName) {
if (configExists(moduleName)) {
try{
InputStream inputStream = new FileInputStream(getPropertyPath(moduleName));
Properties props = new Properties();
props.load(inputStream);
inputStream.close();
Set<String> keys = props.stringPropertyNames();
Map<String, String> map = new HashMap<String, String>();
@@ -151,6 +160,11 @@ public class ModuleSettings {
}
return map;
}
catch(IOException e){
Logger.getLogger(ModuleSettings.class.getName()).log(Level.WARNING, "Could not read config file [" + moduleName + "]", e);
return null;
}
}
else {
makeConfigFile(moduleName);