fix Potential resource leak warnings

eclipse-platform · Jan 22, 2024 · 55034d1 · 55034d1
1 parent 7cb0273
commit 55034d1
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 32 deletions.
diff --git a/...org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java b/...org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ResourceHandler.java
@@ -24,6 +24,7 @@
 import jakarta.inject.Named;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -290,7 +291,9 @@ private Resource getResource(URI uri) throws Exception {
 			// The DataArea.assertLocationInitialized is called by ResourceSetImpl.getResource(URI,
 			// boolean)
 			resource = resourceSet.createResource(uri);
-			resource.load(new URL(uri.toString()).openStream(), resourceSet.getLoadOptions());
+			try (InputStream openStream = new URL(uri.toString()).openStream()) {
+				resource.load(openStream, resourceSet.getLoadOptions());
+			}
 		}
 
 		return resource;

diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
@@ -349,6 +349,7 @@ private static boolean isCommentEnd(StringBuilder buf) {
 		return tagLen >= 5 && "--".equals(buf.substring(tagLen - 2)); //$NON-NLS-1$
 	}
 
+	@SuppressWarnings("resource")
 	private void unread(int ch) throws IOException {
 		((PushbackReader) getReader()).unread(ch);
 	}

diff --git a/...se.search.core/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java b/...se.search.core/search/org/eclipse/search/internal/core/text/FileCharSequenceProvider.java
@@ -291,8 +291,10 @@ private InputStream getInputStream(String charset) throws CoreException, IOExcep
 						int bytesRead= 0;
 						do {
 							int bytes= contents.read(bomStore, bytesRead, bomLength - bytesRead);
-							if (bytes == -1)
+							if (bytes == -1) {
+								contents.close();
 								throw new IOException();
+							}
 							bytesRead += bytes;
 						} while (bytesRead < bomLength);
 

diff --git a/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.ide/META-INF/MANIFEST.MF
@@ -63,7 +63,8 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.20.0,4.0.0)";resol
  org.eclipse.e4.ui.ide;bundle-version="[3.15.0,4.0.0)";visibility:=reexport,
  org.eclipse.e4.core.di;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.e4.core.di.extensions;bundle-version="[0.18.0,1.0.0)",
- org.eclipse.ui.navigator;bundle-version="3.12.0"
+ org.eclipse.ui.navigator;bundle-version="3.12.0",
+ org.eclipse.jdt.annotation
 Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)",
  jakarta.inject;version="[2.0.0,3.0.0)",
  org.osgi.service.event;version="[1.4.0,2.0.0)"

diff --git a/...pse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/ArchiveFileManipulations.java b/...pse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/ArchiveFileManipulations.java
@@ -80,6 +80,7 @@ public static boolean isZipFile(String fileName) {
 	 * @param shell
 	 *            The shell to display any possible Dialogs in
 	 */
+	@SuppressWarnings("resource")
 	public static void closeStructureProvider(ILeveledImportStructureProvider structureProvider, Shell shell) {
 		if (structureProvider instanceof ZipLeveledStructureProvider) {
 			closeZipFile(((ZipLeveledStructureProvider) structureProvider).getZipFile(), shell);

diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/TarFile.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/TarFile.java
@@ -31,7 +31,7 @@
  * @since 3.1
  */
 public class TarFile implements AutoCloseable {
-	private File file;
+	private final File file;
 	private TarInputStream entryEnumerationStream;
 	private TarEntry curEntry;
 	private TarInputStream entryStream;

diff --git a/....ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/TarLeveledStructureProvider.java b/....ui.ide/src/org/eclipse/ui/internal/wizards/datatransfer/TarLeveledStructureProvider.java
@@ -173,11 +173,12 @@ public TarFile getTarFile() {
 
 	@Override
 	public boolean closeArchive(){
-		try {
-			getTarFile().close();
+		TarFile tf = getTarFile();
+		try (tf) {
+			// autoclose
 		} catch (IOException e) {
 			IDEWorkbenchPlugin.log(DataTransferMessages.ZipImport_couldNotClose
-					+ getTarFile().getName(), e);
+					+ tf.getName(), e);
 			return false;
 		}
 		return true;

diff --git a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/FileTool.java b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/FileTool.java
@@ -51,30 +51,22 @@ public class FileTool {
 	public static void unzip(ZipFile zipFile, File dstDir) throws IOException {
 		Enumeration<? extends ZipEntry> entries = zipFile.entries();
 
-		try {
-			while(entries.hasMoreElements()){
-				ZipEntry entry = entries.nextElement();
-				if(entry.isDirectory()){
-					continue;
-				}
-				String entryName = entry.getName();
-				if (!new File(dstDir, entryName).toPath().normalize().startsWith(dstDir.toPath().normalize())) {
-					throw new RuntimeException("Bad zip entry: " + entryName); //$NON-NLS-1$
-				}
-				File file = new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
-				file.getParentFile().mkdirs();
-
-				try (
-						InputStream src = zipFile.getInputStream(entry);
-						OutputStream dst = new FileOutputStream(file)
-					) {
-					transferData(src, dst);
-				}
+		while (entries.hasMoreElements()) {
+			ZipEntry entry= entries.nextElement();
+			if (entry.isDirectory()) {
+				continue;
+			}
+			String entryName= entry.getName();
+			if (!new File(dstDir, entryName).toPath().normalize().startsWith(dstDir.toPath().normalize())) {
+				throw new RuntimeException("Bad zip entry: " + entryName); //$NON-NLS-1$
 			}
-		} finally {
-			try {
-				zipFile.close();
-			} catch(IOException e){
+			File file= new File(dstDir, changeSeparator(entryName, '/', File.separatorChar));
+			file.getParentFile().mkdirs();
+
+			try (
+					InputStream src= zipFile.getInputStream(entry);
+					OutputStream dst= new FileOutputStream(file)) {
+				transferData(src, dst);
 			}
 		}
 	}

diff --git a/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/ResourceHelper.java b/tests/org.eclipse.search.tests/src/org/eclipse/search/tests/ResourceHelper.java
@@ -171,8 +171,9 @@ public static IProject createLinkedProject(String projectName, Plugin plugin, IP
 
 	public static IProject createJUnitSourceProject(String projectName) throws CoreException, ZipException, IOException {
 		IProject project= ResourceHelper.createProject(projectName);
-		ZipFile zip= new ZipFile(FileTool.getFileInPlugin(SearchTestPlugin.getDefault(), IPath.fromOSString("testresources/junit37-noUI-src.zip"))); //$NON-NLS-1$
-		FileTool.unzip(zip, project.getLocation().toFile());
+		try (ZipFile zip= new ZipFile(FileTool.getFileInPlugin(SearchTestPlugin.getDefault(), IPath.fromOSString("testresources/junit37-noUI-src.zip")))) { //$NON-NLS-1$
+			FileTool.unzip(zip, project.getLocation().toFile());
+		}
 		project.refreshLocal(IResource.DEPTH_INFINITE, null);
 		return project;
 	}