Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2010-09-25 08:01:33 +0000
committermkuppe2010-09-25 08:01:33 +0000
commit8d657d06047a93656cd213c090d0f7a4f6e1751f (patch)
tree964ed572042674954b0dfba35f8590552cf29def /compendium
parent892d52edd16957167b6f4504cf5450d376fdf790 (diff)
downloadorg.eclipse.ecf-8d657d06047a93656cd213c090d0f7a4f6e1751f.tar.gz
org.eclipse.ecf-8d657d06047a93656cd213c090d0f7a4f6e1751f.tar.xz
org.eclipse.ecf-8d657d06047a93656cd213c090d0f7a4f6e1751f.zip
RESOLVED - bug 319126: [RemoteSvcs] Wildcard causes IRemoteServiceContainerAdapter.registerRemoteService(String[], Object, Dictionary) to fail
https://bugs.eclipse.org/bugs/show_bug.cgi?id=319126 Add a warning for incorrect wildcard usage
Diffstat (limited to 'compendium')
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/EventHookImpl.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/EventHookImpl.java b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/EventHookImpl.java
index e75b7743c..d8f20ab2a 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/EventHookImpl.java
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/src/org/eclipse/ecf/internal/osgi/services/distribution/EventHookImpl.java
@@ -475,8 +475,20 @@ public class EventHookImpl implements EventHook {
if (wildcard)
return (String[]) serviceReference
.getProperty(org.osgi.framework.Constants.OBJECTCLASS);
- else
- return getStringArrayFromPropertyValue(propValue);
+ else {
+ final String[] stringValue = getStringArrayFromPropertyValue(propValue);
+ if (stringValue != null
+ && stringValue.length == 1
+ && stringValue[0]
+ .equals(IDistributionConstants.SERVICE_EXPORTED_INTERFACES_WILDCARD)) {
+ LogUtility
+ .logWarning(
+ "getExportedInterfaces", //$NON-NLS-1$
+ DebugOptions.EVENTHOOKDEBUG, this.getClass(),
+ "Service Exported Interfaces Wildcard does not accept String[\"*\"]"); //$NON-NLS-1$
+ }
+ return stringValue;
+ }
}
private void trace(String methodName, String message) {

Back to the top