ignite-648: fix reading from file
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b40aba16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b40aba16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b40aba16 Branch: refs/heads/ignite-648 Commit: b40aba162562d36e00880fc0fd1fa1c5d36bd84f Parents: f5578ea Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed May 13 16:38:30 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed May 13 16:38:30 2015 +0300 ---------------------------------------------------------------------- .../multijvm/framework/IgniteNodeRunner.java | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b40aba16/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java index 480b803..f5b2f31 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java @@ -75,20 +75,21 @@ public class IgniteNodeRunner { return fileName; } - private static IgniteConfiguration readCfgFromFileAndDeleteFile(String fileName) throws FileNotFoundException { - BufferedReader cfgReader = new BufferedReader(new FileReader(fileName)); + private static IgniteConfiguration readCfgFromFileAndDeleteFile(String fileName) throws IOException { + try(BufferedReader cfgReader = new BufferedReader(new FileReader(fileName))) { + IgniteConfiguration cfg = (IgniteConfiguration)new XStream().fromXML(cfgReader); - IgniteConfiguration cfg = (IgniteConfiguration)new XStream().fromXML(cfgReader); + cfg.setMarshaller(new OptimizedMarshaller(false)); - cfg.setMarshaller(new OptimizedMarshaller(false)); + TcpDiscoverySpi disco = new TcpDiscoverySpi(); + disco.setIpFinder(new TcpDiscoveryMulticastIpFinder()); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(new TcpDiscoveryMulticastIpFinder()); + cfg.setDiscoverySpi(disco); - cfg.setDiscoverySpi(disco); - - new File(fileName).delete(); - - return cfg; + return cfg; + } + finally { + new File(fileName).delete(); + } } }
