root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

[bs-53] Fix class loading problem with Log in a Condition

This commit is contained in:
Dave Syer 2013-05-13 17:36:07 +01:00
parent 71c0fdd22d
commit ceea71fc38
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseAutoConfiguration.java
View File

@ -50,9 +50,6 @@ import org.springframework.util.ClassUtils;
@ConditionalOnMissingBean(DataSource.class) @ConditionalOnMissingBean(DataSource.class)
public class EmbeddedDatabaseAutoConfiguration { public class EmbeddedDatabaseAutoConfiguration {
private static Log logger = LogFactory
.getLog(EmbeddedDatabaseAutoConfiguration.class);
private static final Map<EmbeddedDatabaseType, String> EMBEDDED_DATABASE_TYPE_CLASSES; private static final Map<EmbeddedDatabaseType, String> EMBEDDED_DATABASE_TYPE_CLASSES;
static { static {
EMBEDDED_DATABASE_TYPE_CLASSES = new LinkedHashMap<EmbeddedDatabaseType, String>(); EMBEDDED_DATABASE_TYPE_CLASSES = new LinkedHashMap<EmbeddedDatabaseType, String>();
@ -100,6 +97,8 @@ public class EmbeddedDatabaseAutoConfiguration {
static class EmbeddedDatabaseCondition implements Condition { static class EmbeddedDatabaseCondition implements Condition {
private static Log logger = LogFactory.getLog(EmbeddedDatabaseCondition.class);
@Override @Override
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
if (!ClassUtils.isPresent( if (!ClassUtils.isPresent(