FileSystemResourceManager.write close OutputStream

transferStreams() already closes stream, but in case of Exception that could be to late.
eclipse-platform · Jun 15, 2023 · 1809821 · 1809821
1 parent babb9ea
commit 1809821
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/...se.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java b/...se.core.resources/src/org/eclipse/core/internal/localstore/FileSystemResourceManager.java
@@ -1172,14 +1172,18 @@ public void write(IFile target, InputStream content, IFileInfo fileInfo, int upd
 				subMonitor.split(1);
 			}
 			int options = append ? EFS.APPEND : EFS.NONE;
-			OutputStream out = store.openOutputStream(options, subMonitor.split(1));
-			if (restoreHiddenAttribute) {
-				fileInfo.setAttribute(EFS.ATTRIBUTE_HIDDEN, true);
-				store.putInfo(fileInfo, EFS.SET_ATTRIBUTES, subMonitor.split(1));
-			} else {
-				subMonitor.split(1);
+			try (OutputStream out = store.openOutputStream(options, subMonitor.split(1))) {
+				if (restoreHiddenAttribute) {
+					fileInfo.setAttribute(EFS.ATTRIBUTE_HIDDEN, true);
+					store.putInfo(fileInfo, EFS.SET_ATTRIBUTES, subMonitor.split(1));
+				} else {
+					subMonitor.split(1);
+				}
+				FileUtil.transferStreams(content, out, store.toString(), subMonitor.split(1));
+			} catch (IOException e) {
+				String msg = NLS.bind(Messages.localstore_couldNotWrite, store.toString());
+				throw new ResourceException(IResourceStatus.FAILED_WRITE_LOCAL, new Path(store.toString()), msg, e);
 			}
-			FileUtil.transferStreams(content, out, store.toString(), subMonitor.split(1));
 			// get the new last modified time and stash in the info
 			lastModified = store.fetchInfo().getLastModified();
 			ResourceInfo info = ((Resource) target).getResourceInfo(false, true);