diff options
| author | Markus Alexander Kuppe | 2013-10-19 07:41:08 +0000 |
|---|---|---|
| committer | Markus Alexander Kuppe | 2013-10-19 07:41:08 +0000 |
| commit | 4b8ab7f62c3e1371b022994294abd3a5ac158221 (patch) | |
| tree | 284f71cd1802ae951eb2e3533cdf4f7167488f6d /protocols/bundles/ch.ethz.iks.r_osgi.remote | |
| parent | 26e4c35c7982626a34ea76090d512f1245f3c5b2 (diff) | |
| download | org.eclipse.ecf-4b8ab7f62c3e1371b022994294abd3a5ac158221.tar.gz org.eclipse.ecf-4b8ab7f62c3e1371b022994294abd3a5ac158221.tar.xz org.eclipse.ecf-4b8ab7f62c3e1371b022994294abd3a5ac158221.zip | |
NEW - bug 419902: [r-OSGi] NPE
ch.ethz.iks.r_osgi.impl.ChannelEndpointImpl.updateTopics(String[],
String[])
https://bugs.eclipse.org/bugs/show_bug.cgi?id=419902
Diffstat (limited to 'protocols/bundles/ch.ethz.iks.r_osgi.remote')
| -rw-r--r-- | protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ChannelEndpointImpl.java | 9 |
1 files changed, 8 insertions, 1 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 f026d2359..28032bd49 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 @@ -1468,7 +1468,14 @@ public final class ChannelEndpointImpl implements ChannelEndpoint { final String[] topicsRemoved) { if (handlerReg == null) { - if (topicsAdded.length > 0) { + // Remote might send a + // ch.ethz.iks.r_osgi.messages.LeaseUpdateMessage.TOPIC_UPDATE + // message + // (see + // ch.ethz.iks.r_osgi.impl.RemoteOSGiServiceImpl.setupTrackers(...).new + // ServiceTrackerCustomizer() {...}.removedService(ServiceReference, + // Object)) with null as the topicsAdded list. Thus, ignore null. + if (topicsAdded != null && topicsAdded.length > 0) { // register handler final Dictionary properties = new Hashtable(); properties.put(EventConstants.EVENT_TOPIC, topicsAdded); |