Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8609183A9 for ; Wed, 13 May 2015 13:46:33 +0000 (UTC) Received: (qmail 42125 invoked by uid 500); 13 May 2015 13:46:33 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42095 invoked by uid 500); 13 May 2015 13:46:33 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 42086 invoked by uid 99); 13 May 2015 13:46:33 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 13:46:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 06B2B182369 for ; Wed, 13 May 2015 13:46:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id kTNerkpBgOxm for ; Wed, 13 May 2015 13:46:28 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id D37A140E1C for ; Wed, 13 May 2015 13:46:27 +0000 (UTC) Received: (qmail 42079 invoked by uid 99); 13 May 2015 13:46:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2015 13:46:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2B68EE0F7D; Wed, 13 May 2015 13:46:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <1e8ad305aa5047299f01989f3ea29d60@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: ignite-648: set grid logger to null Date: Wed, 13 May 2015 13:46:27 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 b40aba162 -> dd813e704 ignite-648: set grid logger to null Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd813e70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd813e70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd813e70 Branch: refs/heads/ignite-648 Commit: dd813e704b09f6ec144da828facd63f68690ad00 Parents: b40aba1 Author: Artem Shutak Authored: Wed May 13 16:46:55 2015 +0300 Committer: Artem Shutak Committed: Wed May 13 16:46:55 2015 +0300 ---------------------------------------------------------------------- .../cache/multijvm/framework/IgniteNodeRunner.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd813e70/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 f5b2f31..b591202 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 @@ -61,6 +61,14 @@ public class IgniteNodeRunner { } } + /** + * Stores {@link IgniteConfiguration} to file as xml. + * + * @param cfg Ignite Configuration. + * @return A name of file where the configuration was stored. + * @throws IOException If failed. + * @see #readCfgFromFileAndDeleteFile(String) + */ public static String storeToFile(IgniteConfiguration cfg) throws IOException { String fileName = IGNITE_CONFIGURATION_FILE + cfg.getNodeId(); @@ -68,6 +76,7 @@ public class IgniteNodeRunner { cfg.setMBeanServer(null); cfg.setMarshaller(null); cfg.setDiscoverySpi(null); + cfg.setGridLogger(null); new XStream().toXML(cfg, out); } @@ -75,6 +84,14 @@ public class IgniteNodeRunner { return fileName; } + /** + * Reads configuration from given file and delete the file after. + * + * @param fileName File name. + * @return Readed configuration. + * @throws IOException If failed. + * @see #storeToFile(IgniteConfiguration) + */ private static IgniteConfiguration readCfgFromFileAndDeleteFile(String fileName) throws IOException { try(BufferedReader cfgReader = new BufferedReader(new FileReader(fileName))) { IgniteConfiguration cfg = (IgniteConfiguration)new XStream().fromXML(cfgReader);