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 2020/09/11 16:17:10 UTC
[aries-jax-rs-whiteboard] 06/06: make it more obvious it is one or
the other
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit eda6d6bf8841a60e7b46a53a537180e9d73dfa0f
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Fri Sep 11 09:49:42 2020 +0200
make it more obvious it is one or the other
---
.../jax/rs/whiteboard/internal/Whiteboard.java | 25 +++++++++++-----------
1 file changed, 13 insertions(+), 12 deletions(-)
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 fa30bab..fd5a7a1 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
@@ -359,18 +359,19 @@ public class Whiteboard {
cachingServiceReference, service)
);
}
-
- return just(
- new PrototypeServiceReferenceResourceProvider(
- cachingServiceReference,
- serviceTuple.getService().getClass(),
- serviceTuple.getServiceObjects())
- ).effects(
- __ -> {},
- __ -> serviceTuple.dispose(),
- __ -> {},
- __ -> {}
- );
+ else {
+ return just(
+ new PrototypeServiceReferenceResourceProvider(
+ cachingServiceReference,
+ serviceTuple.getService().getClass(),
+ serviceTuple.getServiceObjects())
+ ).effects(
+ __ -> {},
+ __ -> serviceTuple.dispose(),
+ __ -> {},
+ __ -> {}
+ );
+ }
}
else {
return just(