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/21 17:47:56 UTC
svn commit: r1827424 - in
/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal:
OnlyLastPublisher.java TransformerOSGi.java
Author: csierra
Date: Wed Mar 21 17:47:56 2018
New Revision: 1827424
URL: http://svn.apache.org/viewvc?rev=1827424&view=rev
Log:
[Component-DSL] Fix only last publisher
Modified:
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java
aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/TransformerOSGi.java
Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java?rev=1827424&r1=1827423&r2=1827424&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OnlyLastPublisher.java Wed Mar 21 17:47:56 2018
@@ -41,6 +41,7 @@ public class OnlyLastPublisher<T> implem
}
private final Publisher<T> _op;
+ private volatile boolean _closed;
private Supplier<T> _injectOnLeave;
private Runnable _terminator;
@@ -57,14 +58,16 @@ public class OnlyLastPublisher<T> implem
return () -> {
_terminator.run();
- _terminator = _op.publish(_injectOnLeave.get());
+ if (!_closed) {
+ _terminator = _op.publish(_injectOnLeave.get());
+ }
};
}
}
@Override
public synchronized void close() {
- _terminator.run();
+ _closed = true;
}
}
Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/TransformerOSGi.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/TransformerOSGi.java?rev=1827424&r1=1827423&r2=1827424&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/TransformerOSGi.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/TransformerOSGi.java Wed Mar 21 17:47:56 2018
@@ -40,9 +40,9 @@ public class TransformerOSGi<T, R> exten
publisher.start();
},
() -> {
- osGiResult.close();
-
publisher.close();
+
+ osGiResult.close();
}
);
});