cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r889079 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
Date Thu, 10 Dec 2009 03:47:53 GMT
Author: dkulp
Date: Thu Dec 10 03:47:53 2009
New Revision: 889079

URL: http://svn.apache.org/viewvc?rev=889079&view=rev
Log:
Merged revisions 889077 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r889077 | dkulp | 2009-12-09 22:40:49 -0500 (Wed, 09 Dec 2009) | 9 lines
  
  Merged revisions 889066 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r889066 | dkulp | 2009-12-09 22:15:27 -0500 (Wed, 09 Dec 2009) | 1 line
    
    [CXF-2552] Use factory.isSingleton(name) instaed of def.isSingleton()
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java?rev=889079&r1=889078&r2=889079&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanMap.java
Thu Dec 10 03:47:53 2009
@@ -50,7 +50,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/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java?rev=889079&r1=889078&r2=889079&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/configuration/spring/SpringBeanQNameMap.java
Thu Dec 10 03:47:53 2009
@@ -48,7 +48,7 @@
 
             BeanDefinition def = ctxt.getBeanFactory().getBeanDefinition(beanNames[i]);
 
-            if (!def.isSingleton() || def.isAbstract()) {
+            if (!beanFactory.isSingleton(beanNames[i]) || def.isAbstract()) {
                 continue;
             }
 



Mime
View raw message