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 72DB2186AB for ; Fri, 24 Apr 2015 07:02:11 +0000 (UTC) Received: (qmail 72007 invoked by uid 500); 24 Apr 2015 07:02:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71980 invoked by uid 500); 24 Apr 2015 07:02:11 -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 71971 invoked by uid 99); 24 Apr 2015 07:02:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 07:02:11 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 07:01:46 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A7A7D25FAC for ; Fri, 24 Apr 2015 07:01:40 +0000 (UTC) Received: (qmail 70179 invoked by uid 99); 24 Apr 2015 07:01:38 -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; Fri, 24 Apr 2015 07:01:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DCC85E1941; Fri, 24 Apr 2015 07:01:37 +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 Date: Fri, 24 Apr 2015 07:02:05 -0000 Message-Id: <48355927506b4e82971c5b76444e0ac0@git.apache.org> In-Reply-To: <6a86f978602e44639622fb07ba26a81d@git.apache.org> References: <6a86f978602e44639622fb07ba26a81d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] incubator-ignite git commit: # Fix failed Hadoop tests. X-Virus-Checked: Checked by ClamAV on apache.org # Fix failed Hadoop tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/734feb0b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/734feb0b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/734feb0b Branch: refs/heads/ignite-157-1 Commit: 734feb0b4d9b3c126b68c96b8d11051ba07e82cf Parents: 0ee2799 Author: sevdokimov Authored: Thu Apr 23 12:13:58 2015 +0300 Committer: sevdokimov Committed: Thu Apr 23 12:13:58 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/734feb0b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index d5c0d44..f3a9051 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -985,7 +985,7 @@ public abstract class GridAbstractTest extends TestCase { cfg.setNodeId(null); - if (gridName.matches(".*\\d")) { + if (gridName != null && gridName.matches(".*\\d")) { String idStr = UUID.randomUUID().toString(); char[] chars = idStr.toCharArray();