From dfdfc03ff32d638aa68ab618fd3bd0649402f64a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 22 Dec 2014 20:02:25 +0100 Subject: [PATCH] Polishing --- .../factory/support/AbstractBeanFactory.java | 15 ++++++++++----- .../java/org/springframework/util/ClassUtils.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) 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 index 3632fad7d8cd..cb53fcbc5d87 100644 --- 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 @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; @@ -151,7 +152,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp private boolean hasDestructionAwareBeanPostProcessors; /** Map from scope identifier String to corresponding Scope */ - private final Map scopes = new HashMap(8); + private final Map scopes = new LinkedHashMap(8); /** Security context used when running with a SecurityManager */ private SecurityContextProvider securityContextProvider; @@ -856,11 +857,15 @@ public void registerScope(String scopeName, Scope scope) { throw new IllegalArgumentException("Cannot replace existing scopes 'singleton' and 'prototype'"); } Scope previous = this.scopes.put(scopeName, scope); - if (previous != null && logger.isInfoEnabled()) { - logger.info("Replacing scope '" + scopeName + "' from '" + previous + "' to '" + scope); + if (previous != null && previous != scope) { + if (logger.isInfoEnabled()) { + logger.info("Replacing scope '" + scopeName + "' from [" + previous + "] to [" + scope + "]"); + } } - else if (previous == null && logger.isDebugEnabled()) { - logger.debug("Registering scope '" + scopeName + "' with '" + scope + "'"); + else { + if (logger.isDebugEnabled()) { + logger.debug("Registering scope '" + scopeName + "' with implementation [" + scope + "]"); + } } } diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java index f0c9e28ce948..af2c20ef0cec 100644 --- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java @@ -893,7 +893,7 @@ public static boolean isPrimitiveWrapperArray(Class clazz) { */ public static Class resolvePrimitiveIfNecessary(Class clazz) { Assert.notNull(clazz, "Class must not be null"); - return (clazz.isPrimitive() && clazz != void.class? primitiveTypeToWrapperMap.get(clazz) : clazz); + return (clazz.isPrimitive() && clazz != void.class ? primitiveTypeToWrapperMap.get(clazz) : clazz); } /**