You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2015/11/20 17:44:16 UTC
svn commit: r1715388 -
/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Author: gnodet
Date: Fri Nov 20 16:44:16 2015
New Revision: 1715388
URL: http://svn.apache.org/viewvc?rev=1715388&view=rev
Log:
[ARIES-1456] Support processors implementing both ComponentDefinitionRegistryProcessor and Processor interfaces
Modified:
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1715388&r1=1715387&r2=1715388&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Fri Nov 20 16:44:16 2015
@@ -531,13 +531,16 @@ public class BlueprintContainerImpl
continue;
}
+ Object obj = null;
if (ComponentDefinitionRegistryProcessor.class.isAssignableFrom(clazz)) {
- Object obj = repository.create(bean.getId(), ProxyUtils.asList(ComponentDefinitionRegistryProcessor.class));
+ obj = repository.create(bean.getId(), ProxyUtils.asList(ComponentDefinitionRegistryProcessor.class));
((ComponentDefinitionRegistryProcessor) obj).process(componentDefinitionRegistry);
- } else if (Processor.class.isAssignableFrom(clazz)) {
- Object obj = repository.create(bean.getId(), ProxyUtils.asList(Processor.class));
+ }
+ if (Processor.class.isAssignableFrom(clazz)) {
+ obj = repository.create(bean.getId(), ProxyUtils.asList(Processor.class));
this.processors.add((Processor) obj);
- } else {
+ }
+ if (obj == null) {
continue;
}
untrackServiceReferences();