Wrap the datasource in postProcessBeforeInitialization instead of pos…

…tProcessAfterInitialization
candrews · Jul 27, 2017 · bfa8bf9 · bfa8bf9
1 parent 47b8fe2
commit bfa8bf9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/com/integralblue/log4jdbc/spring/Log4jdbcBeanPostProcessor.java b/src/main/java/com/integralblue/log4jdbc/spring/Log4jdbcBeanPostProcessor.java
@@ -67,11 +67,6 @@ public class Log4jdbcBeanPostProcessor implements BeanPostProcessor {
 
 	@Override
 	public Object postProcessBeforeInitialization(final Object bean, final String beanName) throws BeansException {
-		return bean;
-	}
-
-	@Override
-	public Object postProcessAfterInitialization(final Object bean, final String beanName) throws BeansException {
 		if (bean instanceof DataSource) {
 			return new DataSourceSpy((DataSource) bean);
 		}
@@ -80,6 +75,11 @@ public Object postProcessAfterInitialization(final Object bean, final String bea
 		}
 	}
 
+	@Override
+	public Object postProcessAfterInitialization(final Object bean, final String beanName) throws BeansException {
+		return bean;
+	}
+
 	@PostConstruct
 	public void postConstruct() {
 		// Log4jdbc only reads configuration from system properties, so copy relevant environment property to system properties