Author: dkulp
Date: Thu Sep 15 19:09:19 2011
New Revision: 1171230
URL: http://svn.apache.org/viewvc?rev=1171230&view=rev
Log:
Merged revisions 1171224 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1171224 | dkulp | 2011-09-15 15:03:31 -0400 (Thu, 15 Sep 2011) | 2 lines
[CXF-3805] Fix problem with initializing all the factories when not
needed
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=1171230&r1=1171229&r2=1171230&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
Thu Sep 15 19:09:19 2011
@@ -100,7 +100,7 @@ public class SpringBeanLocator implement
public List<String> getBeanNamesOfType(Class<?> type) {
Set<String> s = new
LinkedHashSet<String>(Arrays.asList(context.getBeanNamesForType(type,
false,
-
true)));
+
false)));
s.removeAll(passThroughs);
s.addAll(orig.getBeanNamesOfType(type));
return new ArrayList<String>(s);
@@ -110,7 +110,7 @@ public class SpringBeanLocator implement
public <T> Collection<? extends T> getBeansOfType(Class<T> type) {
Set<String> s = new
LinkedHashSet<String>(Arrays.asList(context.getBeanNamesForType(type,
false,
-
true)));
+
false)));
s.removeAll(passThroughs);
List<T> lst = new LinkedList<T>();
for (String n : s) {
@@ -150,7 +150,7 @@ public class SpringBeanLocator implement
BeanLoaderListener<T> listener) {
List<String> list = new
ArrayList<String>(Arrays.asList(context.getBeanNamesForType(type,
false,
-
true)));
+
false)));
list.removeAll(passThroughs);
Collections.reverse(list);
boolean loaded = false;
