minor, fixed NPE in test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3087662e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3087662e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3087662e Branch: refs/heads/ignite-646 Commit: 3087662e3b32b1575ac429d43dae1f7eab2dcb7f Parents: 86cc1ad Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Apr 23 12:19:57 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Apr 23 12:19:57 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +- .../test/java/org/apache/ignite/internal/GridFactorySelfTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3087662e/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(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3087662e/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java index 402bd86..ecc7fb7 100644 --- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java +++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java @@ -62,7 +62,8 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { private static final AtomicInteger cnt = new AtomicInteger(); /** */ - private static final String CUSTOM_CFG_PATH = "modules/core/src/test/config/factory/custom-grid-name-spring-test.xml"; + private static final String CUSTOM_CFG_PATH = + "modules/core/src/test/config/factory/custom-grid-name-spring-test.xml"; /** *
