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 2016/12/02 17:33:59 UTC
svn commit: r1772387 -
/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java
Author: csierra
Date: Fri Dec 2 17:33:59 2016
New Revision: 1772387
URL: http://svn.apache.org/viewvc?rev=1772387&view=rev
Log:
Fix wrong null handling
Modified:
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java
Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java?rev=1772387&r1=1772386&r2=1772387&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ConfigurationOSGiImpl.java Fri Dec 2 17:33:59 2016
@@ -68,14 +68,14 @@ public class ConfigurationOSGiImpl
Tuple<Dictionary<String, ?>> old =
tupleAtomicReference.get();
- if (old != null) {
+ if (old.t != null) {
removedSource.accept(old);
}
Tuple<Dictionary<String, ?>> tuple =
Tuple.create(properties);
- if (old != null) {
+ if (properties != null) {
addedSource.accept(tuple);
}