You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/03/16 16:32:21 UTC

svn commit: r1827012 - in /aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional: Utils.java internal/HighestRankingOSGi.java

Author: csierra
Date: Fri Mar 16 16:32:21 2018
New Revision: 1827012

URL: http://svn.apache.org/viewvc?rev=1827012&view=rev
Log:
[Component-DSL] Merge all produced elements by default

Modified:
    aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java
    aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java

Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java?rev=1827012&r1=1827011&r2=1827012&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/Utils.java Fri Mar 16 16:32:21 2018
@@ -19,7 +19,7 @@ public interface Utils {
     static <T> OSGi<T> highest(
         OSGi<T> program, Comparator<? super T> comparator) {
 
-        return highest(program, comparator, __ -> __);
+        return highest(program, comparator, __ -> OSGi.nothing());
     }
 
     static <T> OSGi<T> highest(

Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java?rev=1827012&r1=1827011&r2=1827012&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/HighestRankingOSGi.java Fri Mar 16 16:32:21 2018
@@ -41,7 +41,7 @@ public class HighestRankingOSGi<T> exten
             AtomicReference<Tuple<T>> sent = new AtomicReference<>();
 
             Pad<T, T> notHighestPad = new Pad<>(
-                bundleContext, notHighest, __ -> NOOP);
+                bundleContext, notHighest, highestPipe);
 
             OSGiResultImpl result = ((OSGiImpl<T>) previous)._operation.run(
                 bundleContext,