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

[csierra]

Author: csierra
Date: Thu Aug  3 12:36:38 2017
New Revision: 1803990

URL: http://svn.apache.org/viewvc?rev=1803990&view=rev
Log:
Check for initialization

Otherwise we might return a null tuple

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

Modified: 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java?rev=1803990&r1=1803989&r2=1803990&view=diff
==============================================================================
--- 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java
 (original)
+++ 
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/JustOSGiImpl.java
 Thu Aug  3 12:36:38 2017
@@ -70,7 +70,7 @@ public class JustOSGiImpl<T> extends OSG
                        AtomicReference<OSGiResult<? extends S>> 
atomicReference =
                                new AtomicReference<>(null);
                        AtomicReference<Tuple<S>> tupleReference =
-                               new AtomicReference<>();
+                               new AtomicReference<>(null);
 
                        return new OSGiResultImpl<>(
                                added, removed,
@@ -90,9 +90,17 @@ public class JustOSGiImpl<T> extends OSG
 
                                },
                                () -> {
-                                       
removedSource.accept(tupleReference.get());
+                                       Tuple<S> s = tupleReference.get();
+
+                                       if (s != null) {
+                                               removedSource.accept(s);
+                                       }
+
+                                       OSGiResult<? extends S> osGiResult = 
atomicReference.get();
 
-                                       atomicReference.get().close();
+                                       if (osGiResult != null) {
+                                               osGiResult.close();
+                                       }
                                });
                });
        }