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/07/27 09:57:20 UTC
[3/3] aries-jax-rs-whiteboard git commit: Apply count as the latest
effect
Apply count as the latest effect
Also simplify the logic
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/3ffc0722
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/3ffc0722
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/3ffc0722
Branch: refs/heads/master
Commit: 3ffc07222f22f343c339d0245b0e12624d1a494c
Parents: 96ce3a2
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Jul 27 11:41:17 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Jul 27 11:44:15 2018 +0200
----------------------------------------------------------------------
.../aries/jax/rs/whiteboard/internal/Whiteboard.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/3ffc0722/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index 6f95123..519654f 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -259,11 +259,13 @@ public class Whiteboard {
return
highestPer(
sr -> just(getServiceName(sr::getProperty)),
- all(
- countChanges(getResourcesForWhiteboard(), _counter),
- countChanges(
- getApplicationExtensionsForWhiteboard(), _counter),
- countChanges(applicationsForWhiteboard, _counter)
+ countChanges(
+ all(
+ getResourcesForWhiteboard(),
+ getApplicationExtensionsForWhiteboard(),
+ applicationsForWhiteboard
+ ),
+ _counter
),
this::registerShadowedService,
this::unregisterShadowedService
@@ -1146,7 +1148,9 @@ public class Whiteboard {
OSGi<T> program, ChangeCounter counter) {
return program.effects(
+ __ -> {},
__ -> counter.inc(),
+ __ -> {},
__ -> counter.inc()
);
}