Make sure to close resources.

10 files changed, 135 insertions, 33 deletions

diff --git a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
index 08f657c864..7a8e965f92 100644
--- a/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
+++ b/libhover/org.eclipse.linuxtools.cdt.libhover.texinfoparsers/src/org/eclipse/linuxtools/cdt/libhover/texinfoparsers/ParseGlibcTexinfo.java
@@ -718,9 +718,10 @@ public class ParseGlibcTexinfo {
 		Matcher mm = p.matcher(line);
 		if (mm.find()) {
 			String il;
+			BufferedReader is = null;
 			try {
 				String fileName = (srcdir.endsWith("/") ? srcdir : srcdir + "/") + mm.replaceAll("examples/$1");
-				BufferedReader is = new BufferedReader(new FileReader(fileName));
+				is = new BufferedReader(new FileReader(fileName));
 				while (null != (il = is.readLine())) {
 					// C Help does not ignore "<" or ">" inside a <pre> or <samp> tag
 					// so we have to prepare for two levels of indirection.  The
@@ -738,6 +739,13 @@ public class ParseGlibcTexinfo {
 				}
 			} catch (IOException e) {
 				System.out.println("IOException reading example file");
+			} finally {
+				if (is != null) {
+					try {
+						is.close();
+					} catch (IOException e) {
+					}
+				}
 			}
 		}
 		return Synopsis;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java
index 85d55865f7..ec9fe608f1 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core.tests/src/org/eclipse/linuxtools/oprofile/core/tests/TestCheckEventsPreParse.java
@@ -54,13 +54,15 @@ public class TestCheckEventsPreParse extends TestCase {
 		}
 		File cpuFile = new File(InfoAdapter.CPUTYPE);
 
+		BufferedReader bi = null;
+		BufferedReader eventReader = null;
 		try {
-			BufferedReader bi = new BufferedReader(new FileReader(cpuFile));
+			bi = new BufferedReader(new FileReader(cpuFile));
 			String cpuType = bi.readLine();
 			File opArchEvents = new File(InfoAdapter.OP_SHARE + cpuType + "/" + InfoAdapter.EVENTS);
 			File opArchUnitMasks = new File(InfoAdapter.OP_SHARE + cpuType + "/" + InfoAdapter.UNIT_MASKS);
 			
-			BufferedReader eventReader = new BufferedReader(new FileReader(opArchEvents));
+			eventReader = new BufferedReader(new FileReader(opArchEvents));
 			String line;
 			while ((line = eventReader.readLine()) != null){
 				// find the first event and use it
@@ -73,15 +75,25 @@ public class TestCheckEventsPreParse extends TestCase {
 					end = line.indexOf(" ", start);
 					String um = line.substring(start, end);
 					
-					BufferedReader unitMaskReader = new BufferedReader(new FileReader(opArchUnitMasks));
-					while ((line = unitMaskReader.readLine()) != null){
-						if (line.contains("name:"+um+" ")){
-							start = line.indexOf("default:") + 8;
-							String unitMaskDef = line.substring(start);
-							// convert from hex. to dec.
-							unitMaskDef = unitMaskDef.replaceFirst("0x", "");
-							umask = String.valueOf(Integer.parseInt(unitMaskDef, 16));
-							break;
+					BufferedReader unitMaskReader = null;
+					try {
+						unitMaskReader = new BufferedReader(new FileReader(
+								opArchUnitMasks));
+						while ((line = unitMaskReader.readLine()) != null) {
+							if (line.contains("name:" + um + " ")) {
+								start = line.indexOf("default:") + 8;
+								String unitMaskDef = line.substring(start);
+								// convert from hex. to dec.
+								unitMaskDef = unitMaskDef
+										.replaceFirst("0x", "");
+								umask = String.valueOf(Integer.parseInt(
+										unitMaskDef, 16));
+								break;
+							}
+						}
+					} finally {
+						if (unitMaskReader != null) {
+							unitMaskReader.close();
 						}
 					}
 					break;
@@ -91,6 +103,19 @@ public class TestCheckEventsPreParse extends TestCase {
 			e.printStackTrace();
 		} catch (IOException e) {
 			e.printStackTrace();
+		} finally {
+			if (bi != null) {
+				try {
+					bi.close();
+				} catch (IOException e) {
+				}
+			}
+			if (eventReader != null) {
+				try {
+					eventReader.close();
+				} catch (IOException e) {
+				}
+			}
 		}
 	}
 	
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java
index 82bd8c5e2f..e6c7853162 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/EventIdCache.java
@@ -135,9 +135,9 @@ public class EventIdCache {
 			return unitMaskTag.getAttribute(CATEGORY);
 		}else{
 			File file = new File(InfoAdapter.CPUTYPE);
-
+			BufferedReader bi = null;
 			try {
-				BufferedReader bi = new BufferedReader(new FileReader(file));
+				bi = new BufferedReader(new FileReader(file));
 				String cpuType = bi.readLine();
 				File opArchEvents = new File(InfoAdapter.OP_SHARE + cpuType + "/" + InfoAdapter.EVENTS); //$NON-NLS-1$
 				File opArchUnitMasks = new File(InfoAdapter.OP_SHARE + cpuType + "/" + InfoAdapter.UNIT_MASKS); //$NON-NLS-1$
@@ -151,13 +151,21 @@ public class EventIdCache {
 						int end = line.indexOf(" ", start); //$NON-NLS-1$
 						// grab the string that references the unit mask type
 						String um = line.substring(start, end);
-						BufferedReader unitMaskReader = new BufferedReader(new FileReader(opArchUnitMasks));
-						while ((line = unitMaskReader.readLine()) != null){
-							if (line.contains("name:"+um+" ")){ //$NON-NLS-1$
-								start = line.indexOf("type:") + 5; //$NON-NLS-1$
-								end = line.indexOf(" ", start); //$NON-NLS-1$
-								unitMaskType = line.substring(start, end);
-								return unitMaskType;
+						BufferedReader unitMaskReader = null;
+						try {
+							unitMaskReader = new BufferedReader(new FileReader(
+									opArchUnitMasks));
+							while ((line = unitMaskReader.readLine()) != null) {
+								if (line.contains("name:" + um + " ")) { //$NON-NLS-1$
+									start = line.indexOf("type:") + 5; //$NON-NLS-1$
+									end = line.indexOf(" ", start); //$NON-NLS-1$
+									unitMaskType = line.substring(start, end);
+									return unitMaskType;
+								}
+							}
+						} finally {
+							if (unitMaskReader != null) {
+								unitMaskReader.close();
 							}
 						}
 					}
@@ -167,6 +175,13 @@ public class EventIdCache {
 				e.printStackTrace();
 			} catch (IOException e) {
 				e.printStackTrace();
+			} finally {
+				if (bi != null) {
+					try {
+						bi.close();
+					} catch (IOException e) {
+					}
+				}
 			}
 		}
 		return unitMaskType;
diff --git a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java
index add78fa9be..48c58f9bf5 100644
--- a/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java
+++ b/oprofile/org.eclipse.linuxtools.oprofile.core/src/org/eclipse/linuxtools/internal/oprofile/core/opxml/info/InfoAdapter.java
@@ -222,8 +222,9 @@ public class InfoAdapter extends AbstractDataAdapter{
 	private int getCPUFrequency() {
 		File file = new File(CPUINFO);
 		int val = 0;
+		BufferedReader bi = null;
 		try {
-			BufferedReader bi = new BufferedReader(new FileReader(file));
+			bi = new BufferedReader(new FileReader(file));
 			String line;
 
 			while ((line = bi.readLine()) != null) {
@@ -256,6 +257,13 @@ public class InfoAdapter extends AbstractDataAdapter{
 			e.printStackTrace();
 		} catch (IOException e) {
 			e.printStackTrace();
+		} finally {
+			if (null != bi) {
+				try {
+					bi.close();
+				} catch (IOException e) {
+				}
+			}
 		}
 
 		return val;
diff --git a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
index 317dbc07ac..467cdda855 100644
--- a/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
+++ b/perf/org.eclipse.linuxtools.perf/src/org/eclipse/linuxtools/internal/perf/PerfCore.java
@@ -87,7 +87,13 @@ public class PerfCore {
 			
 		} catch( IOException e ) {
 			e.printStackTrace();
-			
+		} finally {
+			if (null != input) {
+				try {
+					input.close();
+				} catch (IOException e) {
+				}
+			}
 		}
 		String line;
 		try {
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);
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapErrorHandler.java b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapErrorHandler.java
index db2ee73cfa..dd39532cf8 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapErrorHandler.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.core/src/org/eclipse/linuxtools/internal/callgraph/core/SystemTapErrorHandler.java
@@ -55,8 +55,9 @@ public class SystemTapErrorHandler {
 
         // READ FROM THE PROP FILE AND DETERMINE TYPE OF ERROR
         File file = new File(PluginConstants.getPluginLocation() + FILE_PROP);
+        BufferedReader buff = null;
         try {
-            BufferedReader buff = new BufferedReader(new FileReader(file));
+			buff = new BufferedReader(new FileReader(file));
             String line;
 
             for (String message : errorsList) {
@@ -90,6 +91,13 @@ public class SystemTapErrorHandler {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+        	if (buff != null) {
+        		try {
+					buff.close();
+				} catch (IOException e) {
+				}
+        	}
         }
 
     }