diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java index 19b3d2a5d..f70980736 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2017 IBM Corporation and others. All rights reserved. + * Copyright (c) 2007, 2018 IBM Corporation and others. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -206,10 +206,9 @@ public class SimpleConfiguratorUtils { BufferedInputStream bufferedStream = new BufferedInputStream(stream); String encoding = determineEncoding(bufferedStream); - BufferedReader r = new BufferedReader(encoding == null ? new InputStreamReader(bufferedStream) : new InputStreamReader(bufferedStream, encoding)); String line; - try { + try (BufferedReader r = new BufferedReader(encoding == null ? new InputStreamReader(bufferedStream) : new InputStreamReader(bufferedStream, encoding));) { while ((line = r.readLine()) != null) { line = line.trim(); //ignore any comment or empty lines @@ -225,12 +224,6 @@ public class SimpleConfiguratorUtils { if (bundleInfo != null) bundles.add(bundleInfo); } - } finally { - try { - r.close(); - } catch (IOException ex) { - // ignore - } } return bundles; } @@ -336,8 +329,7 @@ public class SimpleConfiguratorUtils { destination = new BufferedOutputStream(destination); try { for (int i = 0; i < sources.size(); i++) { - InputStream source = new BufferedInputStream(sources.get(i)); - try { + try (InputStream source = new BufferedInputStream(sources.get(i))) { byte[] buffer = new byte[8192]; while (true) { int bytesRead = -1; @@ -345,12 +337,6 @@ public class SimpleConfiguratorUtils { break; destination.write(buffer, 0, bytesRead); } - } finally { - try { - source.close(); - } catch (IOException e) { - // ignore - } } } } finally { |