|
|
|
@ -1,5 +1,5 @@ |
|
|
|
/* |
|
|
|
/* |
|
|
|
* Copyright 2002-2015 the original author or authors. |
|
|
|
* Copyright 2002-2016 the original author or authors. |
|
|
|
* |
|
|
|
* |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
* you may not use this file except in compliance with the License. |
|
|
|
@ -449,10 +449,10 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private boolean isDependent(String beanName, String dependentBeanName, Set<String> alreadySeen) { |
|
|
|
private boolean isDependent(String beanName, String dependentBeanName, Set<String> alreadySeen) { |
|
|
|
String canonicalName = canonicalName(beanName); |
|
|
|
|
|
|
|
if (alreadySeen != null && alreadySeen.contains(beanName)) { |
|
|
|
if (alreadySeen != null && alreadySeen.contains(beanName)) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
String canonicalName = canonicalName(beanName); |
|
|
|
Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName); |
|
|
|
Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName); |
|
|
|
if (dependentBeans == null) { |
|
|
|
if (dependentBeans == null) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
|