From 68084c45678e7c6127582a02556fdfe2ef6a212b Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 13 May 2013 11:41:55 -0400 Subject: [PATCH] minor update to prepareLogger Former-commit-id: f982fb266ee46fbe37334ef246c59fc861a2a523 --- .../java/org/owasp/dependencycheck/App.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/owasp/dependencycheck/App.java b/src/main/java/org/owasp/dependencycheck/App.java index bd2a48436..2d7519573 100644 --- a/src/main/java/org/owasp/dependencycheck/App.java +++ b/src/main/java/org/owasp/dependencycheck/App.java @@ -75,17 +75,9 @@ public class App { * Configures the logger for use by the application. */ private static void prepareLogger() { - //while java doc for JUL says to use preferences api - it throws an exception... - //Preferences.systemRoot().put("java.util.logging.config.file", "log.properties"); - //System.getProperties().put("java.util.logging.config.file", "configuration/log.properties"); - - //removed the file handler. since this is a console app - just write to console. -// File dir = new File("logs"); -// if (!dir.exists()) { -// dir.mkdir(); -// } + InputStream in = null; try { - final InputStream in = App.class.getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE); + in = App.class.getClassLoader().getResourceAsStream(LOG_PROPERTIES_FILE); LogManager.getLogManager().reset(); LogManager.getLogManager().readConfiguration(in); } catch (IOException ex) { @@ -93,6 +85,12 @@ public class App { Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex); } catch (SecurityException ex) { Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex); + } finally { + try { + in.close(); + } catch (Exception ex) { + //ignore + } } }