From 0abc534288ad29865076202e5a19a0d9cab075cf Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Sun, 24 Jun 2018 01:42:18 +0200 Subject: [PATCH] fix for linux after windows fix --- .../hostreplacer/UnixHostReplacer.java | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/protocol/hostreplacer/UnixHostReplacer.java b/src/main/protocol/hostreplacer/UnixHostReplacer.java index f4fb5dd..1e42fcf 100644 --- a/src/main/protocol/hostreplacer/UnixHostReplacer.java +++ b/src/main/protocol/hostreplacer/UnixHostReplacer.java @@ -25,7 +25,7 @@ class UnixHostReplacer implements HostReplacer { try { - ArrayList lines = new ArrayList(); + ArrayList lines = new ArrayList<>(); File f1 = new File(hostsFileLocation); fr = new FileReader(f1); br = new BufferedReader(fr); @@ -36,7 +36,6 @@ class UnixHostReplacer implements HostReplacer { if (line.equals(text)) containmmm = true; lines.add(line); - } fr.close(); br.close(); @@ -45,26 +44,21 @@ class UnixHostReplacer implements HostReplacer { out = new BufferedWriter(fw); if (!containmmm) { + System.out.println(text); out.write(text); } for (int i = 0; i < lines.size(); i++) { - out.write(System.getProperty("line.separator")+ lines.get(i)); + out.write(((containmmm && i == 0) ? "" : System.getProperty("line.separator"))+ lines.get(i)); } + out.flush(); + fw.close(); + out.close(); } catch (Exception ex) { ex.printStackTrace(); } - finally { - try { - if (fr != null) fr.close(); - if (br != null) br.close(); - if (fw != null) fw.close(); - if (out != null) out.close(); - } - catch (Exception e) {} - } } @Override @@ -99,19 +93,13 @@ class UnixHostReplacer implements HostReplacer { out.write(lines.get(i)); if (i != lines.size() - 1) out.write(System.getProperty("line.separator")); } + out.flush(); + fw.close(); + out.close(); } catch (Exception ex) { ex.printStackTrace(); } - finally { - try { - if (fr != null) fr.close(); - if (br != null) br.close(); - if (fw != null) fw.close(); - if (out != null) out.close(); - } - catch (Exception e) {} - } } }