svn commit: r1803992 - /aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java

[csierra]

Author: csierra
Date: Thu Aug  3 12:37:03 2017
New Revision: 1803992

URL: http://svn.apache.org/viewvc?rev=1803992&view=rev
Log:
Return a Tuple of null instead of a null Tuple

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

Modified: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java?rev=1803992&r1=1803991&r2=1803992&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
 Thu Aug  3 12:37:03 2017
@@ -80,14 +80,14 @@ public class OSGiImpl<T> implements OSGi
                                                        OSGiResultImpl<S> or2 =
                                                                
program._operation.run(bundleContext);
 
-                                                       or2.added.map(s -> 
{addedSource.accept(s); return null;});
-                                                       or2.removed.map(s -> 
{removedSource.accept(s); return null;});
+                                                       or2.added.map(s -> 
{addedSource.accept(s); return Tuple.create(null);});
+                                                       or2.removed.map(s -> 
{removedSource.accept(s); return Tuple.create(null);});
 
                                                        or2.start.run();
 
                                                        
identities.put(t.original, or2);
 
-                                                       return null;
+                                                       return 
Tuple.create(null);
                                                });
 
                                                or1.removed.map(t -> {
@@ -100,7 +100,7 @@ public class OSGiImpl<T> implements OSGi
                                                                }
                                                        }
 
-                                                       return null;
+                                                       return 
Tuple.create(null);
                                                });
 
                                                or1.start.run();
@@ -158,7 +158,7 @@ public class OSGiImpl<T> implements OSGi
        public OSGiResult<T> run(BundleContext bundleContext, Consumer<T> 
andThen) {
                OSGiResultImpl<T> osgiResult = _operation.run(bundleContext);
 
-               osgiResult.added.map(x -> {andThen.accept(x.t); return null;});
+               osgiResult.added.map(x -> {andThen.accept(x.t); return 
Tuple.create(null);});
 
                osgiResult.start.run();
 
@@ -253,9 +253,9 @@ public class OSGiImpl<T> implements OSGi
                        OSGiResultImpl<T> osgiResult = 
_operation.run(bundleContext);
 
                        osgiResult.added.map(
-                               t -> {router._adding.accept(t); return null;});
+                               t -> {router._adding.accept(t); return 
Tuple.create(null);});
                        osgiResult.removed.map(
-                               t -> {router._leaving.accept(t); return null;});
+                               t -> {router._leaving.accept(t); return 
Tuple.create(null);});
 
                        return new OSGiResultImpl<>(
                                outgoingAddingPipe, outgoingRemovingPipe,