AbstractScriptGenerator.newAntScript: revert close stream #967

#967
eclipse-pde · Dec 5, 2023 · 4d87175 · 4d87175
1 parent bd726ff
commit 4d87175
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
@@ -252,12 +252,26 @@ public void openScript(String scriptLocation, String scriptName) throws CoreExce
 	}
 
 	protected static AntScript newAntScript(String scriptLocation, String scriptName) throws CoreException {
-		try (OutputStream scriptStream = new BufferedOutputStream(new FileOutputStream(scriptLocation + '/' + scriptName))) {
-			return new AntScript(scriptStream);
-		} catch (IOException e) {
+		AntScript result = null;
+		try {
+			@SuppressWarnings("resource") // intentional return a AntScript without closed stream
+			OutputStream scriptStream = new BufferedOutputStream(new FileOutputStream(scriptLocation + '/' + scriptName));
+			try {
+				result = new AntScript(scriptStream);
+			} catch (IOException e) {
+				try {
+					scriptStream.close();
+					String message = NLS.bind(Messages.exception_writingFile, scriptLocation + '/' + scriptName);
+					throw new CoreException(new Status(IStatus.ERROR, PI_PDEBUILD, EXCEPTION_WRITING_FILE, message, e));
+				} catch (IOException e1) {
+					// Ignored		
+				}
+			}
+		} catch (FileNotFoundException e) {
 			String message = NLS.bind(Messages.exception_writingFile, scriptLocation + '/' + scriptName);
 			throw new CoreException(new Status(IStatus.ERROR, PI_PDEBUILD, EXCEPTION_WRITING_FILE, message, e));
 		}
+		return result;
 	}
 
 	public void closeScript() {