From 9ec3a30ade2e331102f3e38667129dc68bece661 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 26 Feb 2013 15:54:53 +0000
Subject: [PATCH] Fix ressource leak

git-svn-id: https://svn.argeo.org/slc/trunk@6089 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../core/execution/SedFilteredResource.java   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/SedFilteredResource.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/SedFilteredResource.java
index 92987fb9f..676918e98 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/SedFilteredResource.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/SedFilteredResource.java
@@ -48,20 +48,22 @@ public class SedFilteredResource implements FactoryBean, InitializingBean {
 	private String charset = "UTF-8";
 	private Charset cs;
 	private CharsetDecoder decoder;
-	//private CharsetEncoder encoder;
+
+	// private CharsetEncoder encoder;
 
 	public Object getObject() throws Exception {
 		if (filters.size() == 0)
 			return source;
 
-		//int capacity = 100 * 1024;// 100 KB
+		// int capacity = 100 * 1024;// 100 KB
 		ByteBuffer bb;
 		if (source instanceof ByteArrayResource) {
 			bb = ByteBuffer.wrap(((ByteArrayResource) source).getByteArray());
 		} else {
+			FileInputStream fis = null;
 			try {
 				File file = source.getFile();
-				FileInputStream fis = new FileInputStream(file);
+				fis = new FileInputStream(file);
 				FileChannel fc = fis.getChannel();
 
 				// Get the file's size and then map it into memory
@@ -78,6 +80,8 @@ public class SedFilteredResource implements FactoryBean, InitializingBean {
 				// FIXME : use nio to parse the stream as it goes
 				bb = ByteBuffer.wrap(IOUtils.toByteArray(source
 						.getInputStream()));
+			} finally {
+				IOUtils.closeQuietly(fis);
 			}
 		}
 		CharBuffer cb = decoder.decode(bb);
@@ -86,10 +90,10 @@ public class SedFilteredResource implements FactoryBean, InitializingBean {
 			String output = matcher.replaceAll(patterns.get(pattern));
 			cb = CharBuffer.wrap(output);
 		}
-//		ByteBuffer bbout = encoder.encode(cb);
-//		ByteArrayOutputStream out = new ByteArrayOutputStream(capacity);
-//		WritableByteChannel wchannel = Channels.newChannel(out);
-//		wchannel.write(bbout);
+		// ByteBuffer bbout = encoder.encode(cb);
+		// ByteArrayOutputStream out = new ByteArrayOutputStream(capacity);
+		// WritableByteChannel wchannel = Channels.newChannel(out);
+		// wchannel.write(bbout);
 		ByteArrayResource res = new ByteArrayResource(cb.toString().getBytes());
 		return res;
 	}
@@ -105,7 +109,7 @@ public class SedFilteredResource implements FactoryBean, InitializingBean {
 	public void afterPropertiesSet() throws Exception {
 		cs = Charset.forName(charset);
 		decoder = cs.newDecoder();
-		//encoder = cs.newEncoder();
+		// encoder = cs.newEncoder();
 
 		for (String sedStr : filters) {
 			sedStr = sedStr.trim();
-- 
2.39.2