Updated Branches: refs/heads/master c29f4101d -> 8d97bee2b
TAP5-2234: Refreshing the browser in Eclipse on Windows sometimes fails with a locking exception Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8d97bee2 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8d97bee2 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8d97bee2 Branch: refs/heads/master Commit: 8d97bee2b7802235f000bc2a0f016b9b45e75173 Parents: c29f410 Author: Howard M. Lewis Ship <[email protected]> Authored: Mon Nov 25 09:29:00 2013 -0800 Committer: Howard M. Lewis Ship <[email protected]> Committed: Mon Nov 25 09:29:00 2013 -0800 ---------------------------------------------------------------------- .../internal/webresources/CoffeeScriptCompiler.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8d97bee2/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java index 849fc22..5871b61 100644 --- a/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java +++ b/tapestry-webresources/src/main/java/org/apache/tapestry5/internal/webresources/CoffeeScriptCompiler.java @@ -5,6 +5,7 @@ import org.apache.tapestry5.annotations.Path; import org.apache.tapestry5.ioc.OperationTracker; import org.apache.tapestry5.ioc.Resource; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; +import org.apache.tapestry5.ioc.internal.util.InternalUtils; import org.apache.tapestry5.services.assets.ResourceDependencies; import org.apache.tapestry5.services.assets.ResourceTransformer; import org.mozilla.javascript.NativeObject; @@ -56,7 +57,17 @@ public class CoffeeScriptCompiler implements ResourceTransformer public InputStream transform(Resource source, ResourceDependencies dependencies) throws IOException { - String content = IOUtils.toString(source.openStream(), UTF8); + InputStream is = null; + String content; + + try + { + is = source.openStream(); + content = IOUtils.toString(is, UTF8); + } finally + { + InternalUtils.close(is); + } RhinoExecutor executor = executorPool.get();
