svn commit: r889066 - in /cxf/trunk: common/common/src/main/java/org/apache/cxf/configuration/spring/ rt/core/src/main/java/org/apache/cxf/bus/spring/

[dkulp]

Author: dkulp
Date: Thu Dec 10 03:15:27 2009
New Revision: 889066

URL: http://svn.apache.org/viewvc?rev=889066&view=rev
Log:
[CXF-2552] Use factory.isSingleton(name) instaed of def.isSingleton()

Modified:
    
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
    
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
    
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java

Modified: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java?rev=889066&r1=889065&r2=889066&view=diff
==============================================================================
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
 (original)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
 Thu Dec 10 03:15:27 2009
@@ -52,7 +52,7 @@
         for (int i = 0; i < beanNames.length; i++) {
             BeanDefinition def = 
ctxt.getBeanFactory().getBeanDefinition(beanNames[i]);
 
-            if (!def.isSingleton() || def.isAbstract()) {
+            if (!beanFactory.isSingleton(beanNames[i]) || def.isAbstract()) {
                 continue;
             }
 

Modified: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java?rev=889066&r1=889065&r2=889066&view=diff
==============================================================================
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
 (original)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
 Thu Dec 10 03:15:27 2009
@@ -55,7 +55,7 @@
 
             BeanDefinition def = 
ctxt.getBeanFactory().getBeanDefinition(beanNames[i]);
 
-            if (!def.isSingleton() || def.isAbstract()) {
+            if (!beanFactory.isSingleton(beanNames[i]) || def.isAbstract()) {
                 continue;
             }
 

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=889066&r1=889065&r2=889066&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
 (original)
+++ 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
 Thu Dec 10 03:15:27 2009
@@ -81,7 +81,7 @@
     public boolean hasConfiguredPropertyValue(String beanName, String 
propertyName, String searchValue) {
         ConfigurableApplicationContext ctxt = 
(ConfigurableApplicationContext)context;
         BeanDefinition def = ctxt.getBeanFactory().getBeanDefinition(beanName);
-        if (!def.isSingleton() || def.isAbstract() || def.isAbstract()) {
+        if (!ctxt.getBeanFactory().isSingleton(beanName) || def.isAbstract()) {
             return false;
         }
         Collection<?> ids = null;