Improve logging of registerScope

snicoll · snicoll · commit 6d6cd56d4a4e · 2014-12-22T18:02:26.000+01:00
Issue: SPR-12519
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
@@ -855,7 +855,13 @@ public void registerScope(String scopeName, Scope scope) {
 		if (SCOPE_SINGLETON.equals(scopeName) || SCOPE_PROTOTYPE.equals(scopeName)) {
 			throw new IllegalArgumentException("Cannot replace existing scopes 'singleton' and 'prototype'");
 		}
-		this.scopes.put(scopeName, scope);
+		Scope previous = this.scopes.put(scopeName, scope);
+		if (previous != null && logger.isInfoEnabled()) {
+			logger.info("Replacing scope '" + scopeName + "' from '" + previous + "' to '" + scope);
+		}
+		else if (previous == null && logger.isDebugEnabled()) {
+			logger.debug("Registering scope '" + scopeName + "' with '" + scope + "'");
+		}
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,13 @@ public void registerScope(String scopeName, Scope scope) {`
`855`	`855`	`if (SCOPE_SINGLETON.equals(scopeName) \|\| SCOPE_PROTOTYPE.equals(scopeName)) {`
`856`	`856`	`throw new IllegalArgumentException("Cannot replace existing scopes 'singleton' and 'prototype'");`
`857`	`857`	`}`
`858`		`- this.scopes.put(scopeName, scope);`
	`858`	`+ Scope previous = this.scopes.put(scopeName, scope);`
	`859`	`+ if (previous != null && logger.isInfoEnabled()) {`
	`860`	`+ logger.info("Replacing scope '" + scopeName + "' from '" + previous + "' to '" + scope);`
	`861`	`+ }`
	`862`	`+ else if (previous == null && logger.isDebugEnabled()) {`
	`863`	`+ logger.debug("Registering scope '" + scopeName + "' with '" + scope + "'");`
	`864`	`+ }`
`859`	`865`	`}`
`860`	`866`
`861`	`867`	`@Override`