From ceea71fc38d62b2a817f2a3b63f0e97fcc9c7b85 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 13 May 2013 17:36:07 +0100 Subject: [PATCH] [bs-53] Fix class loading problem with Log in a Condition --- .../jdbc/EmbeddedDatabaseAutoConfiguration.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseAutoConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseAutoConfiguration.java index d2788a0d49e..4523685c41f 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseAutoConfiguration.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseAutoConfiguration.java @@ -50,9 +50,6 @@ import org.springframework.util.ClassUtils; @ConditionalOnMissingBean(DataSource.class) public class EmbeddedDatabaseAutoConfiguration { - private static Log logger = LogFactory - .getLog(EmbeddedDatabaseAutoConfiguration.class); - private static final Map EMBEDDED_DATABASE_TYPE_CLASSES; static { EMBEDDED_DATABASE_TYPE_CLASSES = new LinkedHashMap(); @@ -100,6 +97,8 @@ public class EmbeddedDatabaseAutoConfiguration { static class EmbeddedDatabaseCondition implements Condition { + private static Log logger = LogFactory.getLog(EmbeddedDatabaseCondition.class); + @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { if (!ClassUtils.isPresent(