diff options
| author | Markus Alexander Kuppe | 2013-10-05 20:03:30 +0000 |
|---|---|---|
| committer | Markus Alexander Kuppe | 2013-10-05 20:03:30 +0000 |
| commit | 58ba74c7b558456dc04925a33bbf5fcc38469237 (patch) | |
| tree | 7fae9f333f20406c952b12390839624cfba427a9 /protocols | |
| parent | 7bb980470d7980629c3e269c7611c8c41263b3df (diff) | |
| download | org.eclipse.ecf-58ba74c7b558456dc04925a33bbf5fcc38469237.tar.gz org.eclipse.ecf-58ba74c7b558456dc04925a33bbf5fcc38469237.tar.xz org.eclipse.ecf-58ba74c7b558456dc04925a33bbf5fcc38469237.zip | |
NEW - bug 418740: [TCK][r-OSGi] NonSerializableException when running
remoteserviceadmin ct
https://bugs.eclipse.org/bugs/show_bug.cgi?id=418740
Diffstat (limited to 'protocols')
2 files changed, 19 insertions, 6 deletions
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ChannelEndpointImpl.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ChannelEndpointImpl.java index bf8119b76..839e6639b 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ChannelEndpointImpl.java +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ChannelEndpointImpl.java @@ -184,8 +184,13 @@ public final class ChannelEndpointImpl implements ChannelEndpoint { * filter for events to prevent loops in the remote delivery if the peers * connected by this channel have non-disjoint topic spaces. */ - private static final String NO_LOOPS = "(!(" //$NON-NLS-1$ - + RemoteEventMessage.EVENT_SENDER_URI + "=*))"; //$NON-NLS-1$ + private static final String NO_LOOPS = "(|(!(" //$NON-NLS-1$ + + RemoteEventMessage.EVENT_SENDER_URI + "=*)" //$NON-NLS-1$ + // [TCK][r-OSGi] NonSerializableException when running remoteserviceadmin ct + // https://bugs.eclipse.org/418740 + + "(!(" + EventConstants.EVENT_TOPIC + + "=org/osgi/service/remoteserviceadmin/*))" //$NON-NLS-1$ + + "))"; //$NON-NLS-1$ private ArrayList workQueue = new ArrayList(); diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiServiceImpl.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiServiceImpl.java index 54fe54f8b..5ce16b804 100644 --- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiServiceImpl.java +++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiServiceImpl.java @@ -356,10 +356,18 @@ final class RemoteOSGiServiceImpl implements RemoteOSGiService, Remoting { } try { - eventHandlerTracker = new ServiceTracker(context, context - .createFilter("(&(" + Constants.OBJECTCLASS + "=" //$NON-NLS-1$ //$NON-NLS-2$ - + EventHandler.class.getName() + ")(!(" //$NON-NLS-1$ - + R_OSGi_INTERNAL + "=*)))"), //$NON-NLS-1$ + eventHandlerTracker = new ServiceTracker( + context, + context.createFilter("(&(" + Constants.OBJECTCLASS + "=" //$NON-NLS-1$ //$NON-NLS-2$ + + EventHandler.class.getName() + + ")(|(!(" //$NON-NLS-1$ + + R_OSGi_INTERNAL + + "=*))" //$NON-NLS-1$ + // [TCK][r-OSGi] NonSerializableException when running remoteserviceadmin ct + // https://bugs.eclipse.org/418740 + + "(!(" //$NON-NLS-1$ + + EventConstants.EVENT_TOPIC + + "=org/osgi/service/remoteserviceadmin/*))))"), //$NON-NLS-1$ new ServiceTrackerCustomizer() { public Object addingService( |