cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1205583 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
Date Wed, 23 Nov 2011 20:51:09 GMT
Author: dkulp
Date: Wed Nov 23 20:51:08 2011
New Revision: 1205583

URL: http://svn.apache.org/viewvc?rev=1205583&view=rev
Log:
Merged revisions 1205520 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1205520 | dkulp | 2011-11-23 13:15:50 -0500 (Wed, 23 Nov 2011) | 1 line
  
  Update to work with Aries bp 0.4 which doesn't export this
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java

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

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java?rev=1205583&r1=1205582&r2=1205583&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
Wed Nov 23 20:51:08 2011
@@ -22,7 +22,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.apache.aries.blueprint.reflect.MetadataUtil;
 import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
@@ -64,7 +63,8 @@ public class BlueprintResourceFactory im
         Object component = blueprintContainer.getComponentMetadata(beanId);
         if (component instanceof BeanMetadata) {
             BeanMetadata local = (BeanMetadata) component;
-            isSingleton = MetadataUtil.isSingletonScope(local);
+            isSingleton = BeanMetadata.SCOPE_SINGLETON.equals(local.getScope())  
+                || (local.getScope() == null && local.getId() != null);
         }
     }
 



Mime
View raw message