You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2014/09/03 23:37:15 UTC

svn commit: r1622362 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java

Author: djencks
Date: Wed Sep  3 21:37:14 2014
New Revision: 1622362

URL: http://svn.apache.org/r1622362
Log:
FELIX-4403 fix compilation problem on some jdks (and not mine, obviously)

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java?rev=1622362&r1=1622361&r2=1622362&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java Wed Sep  3 21:37:14 2014
@@ -668,7 +668,7 @@ public class ConfigurableComponentHolder
             {
                 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 @@ public class ConfigurableComponentHolder
             {
                 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;
         }