Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/osgi
diff options
context:
space:
mode:
authorslewis2018-03-07 15:13:28 -0500
committerslewis2018-03-07 15:13:28 -0500
commitfd322e918d6ffe7c9d3680057165595338f0cd66 (patch)
treed5852919d3d733d1afb16b24ea08a5eb6bc668b5 /osgi
parent09212c8c8538b8d1467dbd3495c724bf3661b593 (diff)
downloadorg.eclipse.ecf-fd322e918d6ffe7c9d3680057165595338f0cd66.tar.gz
org.eclipse.ecf-fd322e918d6ffe7c9d3680057165595338f0cd66.tar.xz
org.eclipse.ecf-fd322e918d6ffe7c9d3680057165595338f0cd66.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=532078
Diffstat (limited to 'osgi')
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java32
1 files changed, 22 insertions, 10 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java
index adcd76031..a613efa67 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/console/RSACommand.java
@@ -366,29 +366,28 @@ public class RSACommand extends AbstractCommand implements Converter {
@Descriptor("Set whether RSA debug output is output to console")
public String rsadebug(@Descriptor("Whether to turn debug on or off") boolean on) {
- String msg = null;
synchronized (this) {
if (debugReg == null) {
if (on) {
debugOn();
- msg = "RSA debugging ON";
+ return "RSA debugging ON";
} else
- msg = "RSA debugging already off";
+ return "RSA debugging already off";
} else {
- if (debugReg != null) {
+ if (on) {
+ return "RSA debugging already on";
+ } else {
debugOff();
- msg = "RSA debugging OFF";
- } else
- msg = "RSA debugging already on";
+ return "RSA debugging OFF";
+ }
}
}
- return msg;
}
@Descriptor("Export a service via Remote Service Admin")
public RemoteServiceAdmin.ExportReference exportservice(CommandSession cs,
- @Descriptor("service.id of service to export") long serviceid, @Parameter(names = {
- "-props" }, absentValue = "") @Descriptor("Map of service properties for exporting the service") Map<String, ?> map) {
+ @Descriptor("service.id of service to export") long serviceid,
+ @Descriptor("Map of service properties for exporting the service") Map<String, ?> map) {
ServiceReference<?> ref = null;
try {
ServiceReference<?>[] refs = context.getAllServiceReferences(null,
@@ -428,6 +427,19 @@ public class RSACommand extends AbstractCommand implements Converter {
}
@Descriptor("Export a service via Remote Service Admin")
+ public RemoteServiceAdmin.ExportReference exportservice(CommandSession cs,
+ @Descriptor("service.id of service to export") long serviceid) {
+ return exportservice(cs, serviceid, null);
+ }
+
+ @Descriptor("Export a service via Remote Service Admin")
+ public RemoteServiceAdmin.ExportReference expsvc(CommandSession cs,
+ @Descriptor("service.id of service to export") long serviceid,
+ @Descriptor("Map of service properties for exporting the service") Map<String, ?> map) {
+ return exportservice(cs, serviceid, map);
+ }
+
+ @Descriptor("Export a service via Remote Service Admin")
public RemoteServiceAdmin.ExportReference expsvc(CommandSession cs,
@Descriptor("service.id of service to export") long serviceid) {
return exportservice(cs, serviceid, null);

Back to the top