Updated Branches: refs/heads/master 2aeb8ab90 -> c0eca43f7
DELTASPIKE-342 minor improvement Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c0eca43f Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c0eca43f Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c0eca43f Branch: refs/heads/master Commit: c0eca43f7d030ef184db2a019ebe46cfef664bb2 Parents: 2aeb8ab Author: gpetracek <gpetra...@apache.org> Authored: Sun Dec 29 19:01:46 2013 +0100 Committer: gpetracek <gpetra...@apache.org> Committed: Sun Dec 29 19:05:35 2013 +0100 ---------------------------------------------------------------------- .../deltaspike/testcontrol/api/junit/CdiTestRunner.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c0eca43f/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 af9d560..5e8ede8 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 @@ -466,7 +466,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner { CdiContainer container = CdiContainerLoader.getCdiContainer(); - stopStartedScopes(); + stopStartedScopes(container); if (this.containerStarted) { @@ -513,7 +513,7 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner { try { - stopStartedScopes(); + stopStartedScopes(CdiContainerLoader.getCdiContainer()); } finally { @@ -608,17 +608,15 @@ public class CdiTestRunner extends BlockJUnit4ClassRunner return this.startedScopes.contains(scopeAnnotation); } - private void stopStartedScopes() + private void stopStartedScopes(CdiContainer container) { - ContextControl contextControl = CdiContainerLoader.getCdiContainer().getContextControl(); - while (!this.startedScopes.empty()) { Class<? extends Annotation> scopeAnnotation = this.startedScopes.pop(); //TODO check if context was started by parent try { - contextControl.stopContext(scopeAnnotation); + container.getContextControl().stopContext(scopeAnnotation); onScopeStopped(scopeAnnotation); } catch (RuntimeException e)