fix regression with FileStream

lucee · Nov 28, 2023 · 4378236 · 4378236
1 parent 18a7bf9
commit 4378236
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/java/lucee/runtime/functions/file/FileAppend.java b/core/src/main/java/lucee/runtime/functions/file/FileAppend.java
@@ -37,13 +37,15 @@ public static String call(PageContext pc, Object file, Object data) throws PageE
 
 	public static String call(PageContext pc, Object file, Object data, String charset) throws PageException {
 		FileStreamWrapper fsw = null;
+		boolean close = false;
 		if (StringUtil.isEmpty(charset, true)) charset = ((PageContextImpl) pc).getResourceCharset().name();
 		Resource res = null;
 		try {
 			if (file instanceof FileStreamWrapper) {
 				fsw = (FileStreamWrapper) file;
 			}
 			else {
+				close = true;
 				res = Caster.toResource(pc, file, false);
 				pc.getConfig().getSecurityManager().checkFileLocation(res);
 				fsw = new FileStreamWrapperWrite(res, charset, true, false);
@@ -54,7 +56,7 @@ public static String call(PageContext pc, Object file, Object data, String chars
 			throw Caster.toPageException(e);
 		}
 		finally {
-			IOUtil.closeEL(fsw);
+			if (close) IOUtil.closeEL(fsw);
 			if (res != null) PageSourcePool.flush(pc, res);
 			else PageSourcePool.flush(pc, file);
 		}

diff --git a/core/src/main/java/lucee/runtime/functions/file/FileWrite.java b/core/src/main/java/lucee/runtime/functions/file/FileWrite.java
@@ -60,7 +60,7 @@ public static String call(PageContext pc, Object obj, Object data, String charse
 			throw Caster.toPageException(e);
 		}
 		finally {
-			IOUtil.closeEL(fsw);
+			if (close) IOUtil.closeEL(fsw);
 			if (fsw != null) PageSourcePool.flush(pc, fsw);
 		}
 

diff --git a/core/src/main/java/lucee/runtime/functions/file/FileWriteLine.java b/core/src/main/java/lucee/runtime/functions/file/FileWriteLine.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 
+import lucee.commons.io.IOUtil;
 import lucee.commons.io.SystemUtil;
 import lucee.commons.io.res.Resource;
 import lucee.runtime.PageContext;
@@ -46,7 +47,7 @@ public static String call(PageContext pc, Object obj, String text) throws PageEx
 				fsw.write(text + SystemUtil.lineSeparator());
 			}
 			finally {
-				if (close && fsw != null) fsw.close();
+				if (close) IOUtil.closeEL(fsw);
 			}
 
 		}