diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java index f78ee2303..f2b601710 100644 --- a/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java +++ b/src/main/org/apache/tools/ant/util/ScriptRunnerBase.java @@ -241,15 +241,15 @@ public abstract class ScriptRunnerBase { final Charset charset; if (null == encoding) { - charset = null; + charset = null; } else { - charset = Charset.forName(encoding); + charset = Charset.forName(encoding); } try { readSource(in, filename, charset); } finally { - FileUtils.close(in); + FileUtils.close(in); } } @@ -283,14 +283,14 @@ public abstract class ScriptRunnerBase { * @throws BuildException if the resource cannot be read */ public void loadResource(Resource sourceResource) { - if (sourceResource instanceof StringResource) { - script += ((StringResource) sourceResource).getValue(); - return; - } - if (sourceResource instanceof PropertyResource) { - script += ((PropertyResource) sourceResource).getValue(); - return; - } + if (sourceResource instanceof StringResource) { + script += ((StringResource) sourceResource).getValue(); + return; + } + if (sourceResource instanceof PropertyResource) { + script += ((PropertyResource) sourceResource).getValue(); + return; + } String name = sourceResource.toLongString(); InputStream in = null; diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java index 5b41d0f4f..b383ca9c3 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java @@ -35,7 +35,7 @@ public class RhinoScriptTest { @Rule public BuildFileRule buildRule = new BuildFileRule(); - + @Before public void setUp() { buildRule.configureProject("src/etc/testcases/taskdefs/optional/script.xml");