- Change bundle symbolic name to avoid "org.apache.felix.org.apache.felix.ipojo..."
- Improve error handling in junit4osgi
- Support cobertura in junit4osgi
- Allow enable/disable the log service provided by the host in junit4osgi
- Fix a bug in the manipulation of construtors to support Cobertura. This issue comes the cobertura manipulation injecting code between the method entry and the super constructor call.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@725068 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index 7a7421d..3474e20 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -61,7 +61,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>iPOJO</Bundle-Name>
+ <Bundle-Name>Apache Felix iPOJO</Bundle-Name>
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
<Bundle-SymbolicName> org.apache.felix.ipojo
</Bundle-SymbolicName>
@@ -76,7 +76,7 @@
handler:org.apache.felix.ipojo.HandlerManagerFactory
</IPOJO-Extension>
<Import-Package> org.osgi.framework;version=1.3, org.osgi.service.cm,
- org.osgi.service.log </Import-Package>
+ org.osgi.service.log, !net.sourceforge.cobertura.* </Import-Package>
<Private-Package> org.apache.felix.ipojo.handlers.architecture,
org.apache.felix.ipojo.handlers.configuration,
org.apache.felix.ipojo.handlers.lifecycle.callback,
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
index e53530d..835a291 100644
--- a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
+++ b/ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
@@ -478,7 +478,10 @@
// The list must confront actual matching services with already get services from the tracker.
int size = m_matchingRefs.size();
- List usedByTracker = m_tracker.getUsedServiceReferences();
+ List usedByTracker = null;
+ if (m_tracker != null) {
+ usedByTracker = m_tracker.getUsedServiceReferences();
+ }
if (size == 0 || usedByTracker == null) { return null; }
List list = new ArrayList(1);