aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r1206167 - /aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
Date Fri, 25 Nov 2011 13:44:00 GMT
Author: davidb
Date: Fri Nov 25 13:43:59 2011
New Revision: 1206167

URL: http://svn.apache.org/viewvc?rev=1206167&view=rev
Log:
Small fix to make the Require-Capability model work.

Modified:
    aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java

Modified: aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java?rev=1206167&r1=1206166&r2=1206167&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
(original)
+++ aries/trunk/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/BaseActivator.java
Fri Nov 25 13:43:59 2011
@@ -94,6 +94,11 @@ public abstract class BaseActivator impl
         }
 
         Object consumerHeader = bundle.getHeaders().get(consumerHeaderName);
+        if (consumerHeader == null) {
+            consumerHeaderName = SpiFlyConstants.REQUIRE_CAPABILITY;
+            consumerHeader = bundle.getHeaders().get(consumerHeaderName);
+        }
+
         if (consumerHeader instanceof String) {
             Set<WeavingData> wd = ConsumerHeaderProcessor.processHeader(consumerHeaderName,
(String) consumerHeader);
             bundleWeavingData.put(bundle, Collections.unmodifiableSet(wd));



Mime
View raw message