Make sure to close resources.

4 files changed, 41 insertions, 9 deletions

diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java
index f9405900eb..fc6c70578c 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/Activator.java
@@ -153,11 +153,18 @@ public class Activator extends AbstractUIPlugin {
 						File groupsFile = new File(file, "GROUPS"); //$NON-NLS-1$
 						if (groupsFile.exists()) {
 
-							LineNumberReader reader = new LineNumberReader(
-									new FileReader(groupsFile));
-							String line;
-							while ((line = reader.readLine()) != null) {
-								rpmGroups.add(line);
+							LineNumberReader reader = null;
+							try {
+								reader = new LineNumberReader(new FileReader(
+										groupsFile));
+								String line;
+								while ((line = reader.readLine()) != null) {
+									rpmGroups.add(line);
+								}
+							} finally {
+								if (reader != null) {
+									reader.close();
+								}
 							}
 							break;
 						}
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
index 1904b5b060..228d4ae9d8 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
@@ -83,8 +83,9 @@ public class RpmMacroProposalsList {
 	 */
 	private void addMacroToMap(String filename) {
 		String line = EMPTY_STRING;
+		BufferedReader reader = null;
 		try {
-			BufferedReader reader = new BufferedReader(new InputStreamReader(
+			reader = new BufferedReader(new InputStreamReader(
 					new FileInputStream(filename)));
 			line = reader.readLine();
 			String key = EMPTY_STRING, value = EMPTY_STRING;
@@ -128,6 +129,13 @@ public class RpmMacroProposalsList {
 			}
 		} catch (IOException e) {
 			SpecfileLog.logError(e);
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+				}
+			}
 		}
 	}
 
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmPackageProposalsList.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmPackageProposalsList.java
index b0d255667d..6efb17d142 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmPackageProposalsList.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmPackageProposalsList.java
@@ -43,9 +43,10 @@ public class RpmPackageProposalsList {
 	private void setPackagesList() {
 		String rpmpkgsFile = Activator.getDefault().getPreferenceStore()
 				.getString(PreferenceConstants.P_RPM_LIST_FILEPATH);
+		BufferedReader reader = null;
 		try {
 			if (Utils.fileExist(rpmpkgsFile)) {
-				BufferedReader reader = new BufferedReader(
+				reader = new BufferedReader(
 						new InputStreamReader(new FileInputStream(rpmpkgsFile)));
 				String line = reader.readLine();
 				while (line != null) {
@@ -58,7 +59,14 @@ public class RpmPackageProposalsList {
 		} catch (IOException e) {
 			RpmPackageBuildProposalsJob.update();
 			SpecfileLog.logError(e);
-		}
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+				}
+			}
+ 		}
 	}
 
 	public List<String[]> getProposals(String prefix) {
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java
index 0787aec4a4..ab7aba560f 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/SpecfileDocumentProvider.java
@@ -14,6 +14,7 @@ package org.eclipse.linuxtools.internal.rpm.ui.editor;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 
@@ -75,9 +76,10 @@ public class SpecfileDocumentProvider extends TextFileDocumentProvider {
 				return true;
 			URI uri = fei.getURI();
 			File f = URIUtil.toFile(uri);
+			BufferedReader input = null;
 			try {
 				if (originalLength != 0) {
-					BufferedReader input = new BufferedReader(new FileReader(f));
+					input = new BufferedReader(new FileReader(f));
 					boolean finished = false;
 					char[] buffer = new char[100];
 					int curoffset = 0;
@@ -96,6 +98,13 @@ public class SpecfileDocumentProvider extends TextFileDocumentProvider {
 				return false;
 			} catch (Exception e) {
 				return true;
+			} finally {
+				if (input != null) {
+					try {
+						input.close();
+					} catch (IOException e) {
+					}
+				}
 			}
 		}
 		return super.canSaveDocument(element);