Repository: deltaspike Updated Branches: refs/heads/master 43bdf6ae5 -> 08d5916ed
DELTASPIKE-1230 fix NPE in CdiTestRunner txs rsandtner for the report! Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/08d5916e Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/08d5916e Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/08d5916e Branch: refs/heads/master Commit: 08d5916ed5719087abe4829f42b83d493c6ede3a Parents: 43bdf6a Author: Mark Struberg <[email protected]> Authored: Thu Jan 19 13:23:19 2017 +0100 Committer: Mark Struberg <[email protected]> Committed: Thu Jan 19 13:23:19 2017 +0100 ---------------------------------------------------------------------- .../apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/08d5916e/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java index 1f97094..fd17416 100644 --- a/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java +++ b/deltaspike/modules/test-control/api/src/main/java/org/apache/deltaspike/testcontrol/api/junit/CdiTestRunner.java @@ -830,7 +830,9 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner { CdiTestRunner cdiTestRunner = currentTestRunner.get(); - if (cdiTestRunner == null) + if (cdiTestRunner == null || + cdiTestRunner.testContext == null || + cdiTestRunner.testContext.externalContainers == null) { return Collections.emptyList(); }
