From b5bba19ccc28531dce0cbc5e34b98978ce0aa6e3 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 2 Apr 2013 18:16:47 +0400 Subject: [PATCH] [r=nik] fox npe in logger initialization --- .../org/jetbrains/jps/cmdline/BuildMain.java | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java index 00dd3c747a25..fcfaca0b5729 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java @@ -277,28 +277,23 @@ public class BuildMain { }); } - private static void ensureLogConfigExists(final File logConfig) { + private static void ensureLogConfigExists(final File logConfig) throws IOException { if (!logConfig.exists()) { FileUtil.createIfDoesntExist(logConfig); - try { - final InputStream in = BuildMain.class.getResourceAsStream("/" + DEFAULT_LOGGER_CONFIG); - if (in != null) { + final InputStream in = BuildMain.class.getResourceAsStream("/" + DEFAULT_LOGGER_CONFIG); + if (in != null) { + try { + final FileOutputStream out = new FileOutputStream(logConfig); try { - final FileOutputStream out = new FileOutputStream(logConfig); - try { - FileUtil.copy(in, out); - } - finally { - out.close(); - } + FileUtil.copy(in, out); } finally { - in.close(); + out.close(); } } - } - catch (IOException e) { - LOG.error(e); + finally { + in.close(); + } } } }