FELIX-4403 fix compilation problem on some jdks (and not mine, obviously)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1622362 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
index b0d6dfa..c5af20a 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
@@ -668,7 +668,7 @@
{
promises.add(cm.enable( async ));
}
- m_enablePromise = new Deferred<List<Void>>().resolveWith(Promises.all(promises));
+ m_enablePromise = new Deferred<List<Void>>().resolveWith(Promises.<Void, Void>all(promises));
m_disablePromise = null;
return m_enablePromise;
}
@@ -698,7 +698,7 @@
{
promises.add(cm.disable( async ));
}
- m_disablePromise = new Deferred<List<Void>>().resolveWith(Promises.all(promises));
+ m_disablePromise = new Deferred<List<Void>>().resolveWith(Promises.<Void, Void>all(promises));
m_enablePromise = null;
return m_disablePromise;
}