You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/09/25 16:20:59 UTC
svn commit: r1841953 -
/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
Author: rotty3000
Date: Tue Sep 25 16:20:59 2018
New Revision: 1841953
URL: http://svn.apache.org/viewvc?rev=1841953&view=rev
Log:
[CDI] cleanup command output
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java?rev=1841953&r1=1841952&r2=1841953&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/command/CDICommand.java Tue Sep 25 16:20:59 2018
@@ -111,7 +111,7 @@ public class CDICommand {
containerDTO,
componentTemplateDTO,
prefix,
- true,
+ !singleAndFactory.isEmpty(),
!singleAndFactory.isEmpty(),
verbose);
@@ -229,10 +229,11 @@ public class CDICommand {
(itr.hasNext() ? TLLS : CLLS),
(configurationDTO != null ? configurationDTO.properties.get(Constants.SERVICE_PID) + STAR : conf.pid));
f.format(
- "%s%s%sPOLICY: %s%n",
+ "%s%s%s%sPOLICY: %s%n",
prefix,
(hasNext ? PSSSPSSS : SSSSPSSS),
- (itr.hasNext() ? PSSSTLLS : SSSSTLLS),
+ (itr.hasNext() ? PSSS : SSSS),
+ ((conf.maximumCardinality == MaximumCardinality.MANY) ? TLLS : CLLS),
conf.policy);
if (conf.maximumCardinality == MaximumCardinality.MANY) {