From 0be83f2e0c84bf8826204c5f3f0576a0c61d66b7 Mon Sep 17 00:00:00 2001 From: nathan Date: Sat, 18 Aug 2018 20:06:49 +0200 Subject: [PATCH] Removed specific dependency on method signature that depended on SLF4J --- .../systemTray/gnomeShell/Extension.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/dorkbox/systemTray/gnomeShell/Extension.java b/src/dorkbox/systemTray/gnomeShell/Extension.java index 72e5f19a..4fb97985 100644 --- a/src/dorkbox/systemTray/gnomeShell/Extension.java +++ b/src/dorkbox/systemTray/gnomeShell/Extension.java @@ -285,7 +285,13 @@ class Extension { } catch (FileNotFoundException ignored) { } catch (IOException ignored) { } finally { - IO.close(bin, logger); + if (bin != null) { + try { + bin.close(); + } catch (IOException e) { + logger.error("Error closing: {}", bin, e); + } + } } @@ -333,7 +339,13 @@ class Extension { } catch (IOException e) { logger.error("Error installing extension metadata file", e); } finally { - IO.close(outputWriter, logger); + if (outputWriter != null) { + try { + outputWriter.close(); + } catch (IOException e) { + logger.error("Error closing: {}", outputWriter, e); + } + } } @@ -357,8 +369,20 @@ class Extension { } catch (IOException e) { logger.error("Unable to get gnome-shell extension", e); } finally { - IO.close(reader, logger); - IO.close(fileOutputStream, logger); + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + logger.error("Error closing: {}", reader, e); + } + } + if (fileOutputStream != null) { + try { + fileOutputStream.close(); + } catch (IOException e) { + logger.error("Error closing: {}", fileOutputStream, e); + } + } } logger.debug("Enabling extension in gnome-shell");