From c168610d2c8bc9879413b3b00f8bd6e90b49ce6a Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Wed, 12 Nov 2008 15:13:34 +0000 Subject: [PATCH] [252969] - applied patch to close streams --- .../DefaultFortranDependencyCalculator.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java index f7430211f13..13163bf69d9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/DefaultFortranDependencyCalculator.java @@ -40,8 +40,9 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen */ private String[] findUsedModuleNames(File file) { ArrayList names = new ArrayList(); + InputStream in = null; try { - InputStream in = new BufferedInputStream(new FileInputStream(file)); + in = new BufferedInputStream(new FileInputStream(file)); Reader r = new BufferedReader(new InputStreamReader(in)); StreamTokenizer st = new StreamTokenizer(r); st.commentChar('!'); @@ -62,9 +63,14 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen } } } - } - catch (Exception e) { + } catch (Exception e) { return new String[0]; + } finally { + // ensure the input stream is closed or we can run out of fd's... + if (in != null) + try { + in.close(); + } catch (IOException e) {/*don't care */} } return (String[]) names.toArray(new String[names.size()]); } @@ -74,8 +80,9 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen */ private String[] findModuleNames(File file) { ArrayList names = new ArrayList(); + InputStream in = null; try { - InputStream in = new BufferedInputStream(new FileInputStream(file)); + in = new BufferedInputStream(new FileInputStream(file)); Reader r = new BufferedReader(new InputStreamReader(in)); StreamTokenizer st = new StreamTokenizer(r); st.commentChar('!'); @@ -96,9 +103,14 @@ public class DefaultFortranDependencyCalculator implements IManagedDependencyGen } } } - } - catch (Exception e) { + } catch (Exception e) { return new String[0]; + } finally { + // ensure the input stream is closed or we run out of fd's... + if (in != null) + try { + in.close(); + } catch (IOException e) {/*don't care */} } return (String[]) names.toArray(new String[names.size()]); }