This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit be49961a797145d42a0846538912d378d8117762 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 23 19:32:46 2015 +0100 fix NPE when no test descirption register --- .../tutti/persistence/test/CleanResourcesRule.java | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java index 1f5abd6..60a2635 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java @@ -29,25 +29,30 @@ public class CleanResourcesRule implements TestRule { public static void cleanResources(Description description) { - if (log.isInfoEnabled()) { - log.info("Try to clean resources for test: " + description); - } - - Failure failure = TuttiRunListener.getFailureForDescription(description); - DatabaseResource databaseResource = RESSOURCES_BY_DESCRIPTIONS.get(description); - if (failure == null) { + if (databaseResource != null) { if (log.isInfoEnabled()) { - log.info("Clean resources (no failure found) for test: " + description); + log.info("Try to clean resources for test: " + description); } - databaseResource.cleanResources(description); - } else { + Failure failure = TuttiRunListener.getFailureForDescription(description); + + + if (failure == null) { + + if (log.isInfoEnabled()) { + log.info("Clean resources (no failure found) for test: " + description); + } + databaseResource.cleanResources(description); + + } else { + + if (log.isWarnEnabled()) { + log.warn("Keep resources ((found failure) for test: " + description); + } - if (log.isWarnEnabled()) { - log.warn("Keep resources ((found failure) for test: " + description); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.