Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Related polishing

Browse Source 
Issue: SPR-11386
This commit is contained in:
Juergen Hoeller
2014-02-04 16:45:14 +01:00
parent 60c1905cdd
commit 6634c19e6a
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
View File

@@ -94,14 +94,15 @@ public class CachedIntrospectionResults {
public static final String IGNORE_BEANINFO_PROPERTY_NAME = "spring.beaninfo.ignore"; public static final String IGNORE_BEANINFO_PROPERTY_NAME = "spring.beaninfo.ignore";
private static final Log logger = LogFactory.getLog(CachedIntrospectionResults.class); private static final boolean shouldIntrospectorIgnoreBeaninfoClasses =
SpringProperties.getFlag(IGNORE_BEANINFO_PROPERTY_NAME);
private static final boolean shouldIntrospectorIgnoreBeaninfoClasses;
/** Stores the BeanInfoFactory instances */ /** Stores the BeanInfoFactory instances */
private static List<BeanInfoFactory> beanInfoFactories = SpringFactoriesLoader.loadFactories( private static List<BeanInfoFactory> beanInfoFactories = SpringFactoriesLoader.loadFactories(
BeanInfoFactory.class, CachedIntrospectionResults.class.getClassLoader()); BeanInfoFactory.class, CachedIntrospectionResults.class.getClassLoader());
private static final Log logger = LogFactory.getLog(CachedIntrospectionResults.class);
/** /**
* Set of ClassLoaders that this CachedIntrospectionResults class will always * Set of ClassLoaders that this CachedIntrospectionResults class will always
* accept classes from, even if the classes do not qualify as cache-safe. * accept classes from, even if the classes do not qualify as cache-safe.
@@ -116,11 +117,6 @@ public class CachedIntrospectionResults {
static final Map<Class<?>, Object> classCache = new WeakHashMap<Class<?>, Object>(); static final Map<Class<?>, Object> classCache = new WeakHashMap<Class<?>, Object>();
static {
shouldIntrospectorIgnoreBeaninfoClasses = SpringProperties.getFlag(IGNORE_BEANINFO_PROPERTY_NAME);
}
/** /**
* Accept the given ClassLoader as cache-safe, even if its classes would * Accept the given ClassLoader as cache-safe, even if its classes would
* not qualify as cache-safe in this CachedIntrospectionResults class. * not qualify as cache-safe in this CachedIntrospectionResults class.

7
spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java vendored
View File

@@ -66,7 +66,6 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
*/ */
public static final String IGNORE_GETENV_PROPERTY_NAME = "spring.getenv.ignore"; public static final String IGNORE_GETENV_PROPERTY_NAME = "spring.getenv.ignore";
/** /**
* Name of property to set to specify active profiles: {@value}. Value may be comma * Name of property to set to specify active profiles: {@value}. Value may be comma
* delimited. * delimited.
@@ -122,14 +121,10 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
* @see #customizePropertySources(MutablePropertySources) * @see #customizePropertySources(MutablePropertySources)
*/ */
public AbstractEnvironment() { public AbstractEnvironment() {
String name = getClass().getSimpleName();
if (this.logger.isDebugEnabled()) {
this.logger.debug(format("Initializing new %s", name));
}
customizePropertySources(this.propertySources); customizePropertySources(this.propertySources);
if (this.logger.isDebugEnabled()) { if (this.logger.isDebugEnabled()) {
this.logger.debug(format( this.logger.debug(format(
"Initialized %s with PropertySources %s", name, this.propertySources)); "Initialized %s with PropertySources %s", getClass().getSimpleName(), this.propertySources));
} }
} }