Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-08-18 19:15:29 +0000
committerslewis2016-08-18 19:15:29 +0000
commita7fd33d759b19b51910c84a92ca0126fe2579e13 (patch)
tree6e33681892cc78b254f97a83d9c091849e76c8e5 /protocols/bundles
parent28d923afd798de6226c3d29a2ee82b152482fd82 (diff)
downloadorg.eclipse.ecf-a7fd33d759b19b51910c84a92ca0126fe2579e13.tar.gz
org.eclipse.ecf-a7fd33d759b19b51910c84a92ca0126fe2579e13.tar.xz
org.eclipse.ecf-a7fd33d759b19b51910c84a92ca0126fe2579e13.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=499942
Diffstat (limited to 'protocols/bundles')
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF2
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/ChannelEndpointImpl.java4
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/RemoteOSGiServiceImpl.java4
3 files changed, 6 insertions, 4 deletions
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
index 49f53cfea..0769162ec 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote
-Bundle-Version: 1.0.7.RC1_qualifier
+Bundle-Version: 1.0.8.RC1_qualifier
Bundle-Vendor: %plugin.provider
Import-Package: org.objectweb.asm;version="[5.0.1,6.0.0)",
org.osgi.framework,
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 57a62b14a..33d50aff7 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
@@ -263,6 +263,8 @@ public final class ChannelEndpointImpl implements ChannelEndpoint {
// TODO: tradeoff, could as well be central for all endpoints...
final ThreadGroup threadPool = new ThreadGroup("WorkerThreads"
+ toString());
+ // Set this thread pool to be daemon threads
+ threadPool.setDaemon(true);
for (int i = 0; i < RemoteOSGiServiceImpl.MAX_THREADS_PER_ENDPOINT; i++) {
final Thread t = new Thread(threadPool, "r-OSGi ChannelWorkerThread" + i) {
public void run() {
@@ -847,7 +849,7 @@ public final class ChannelEndpointImpl implements ChannelEndpoint {
} catch (final BundleException e) {
final Throwable nested = e.getNestedException() == null ? e : e
.getNestedException();
- nested.printStackTrace();
+ //nested.printStackTrace();
throw new RemoteOSGiException(
"Could not install the generated bundle " + ref.toString(), //$NON-NLS-1$
nested);
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 df0292fe8..0fc077dd4 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
@@ -623,7 +623,7 @@ final class RemoteOSGiServiceImpl implements RemoteOSGiService, Remoting {
}
});
- remoteServiceTracker.open();
+ remoteServiceTracker.open(true);
networkChannelFactoryTracker = new ServiceTracker(
context,
@@ -1016,7 +1016,7 @@ final class RemoteOSGiServiceImpl implements RemoteOSGiService, Remoting {
try {
final ServiceReference[] refs = RemoteOSGiActivator.getActivator()
- .getContext().getServiceReferences((String) null, filter);
+ .getContext().getAllServiceReferences((String) null, filter);
if (refs == null) {
if (log != null) {
log.log(LogService.LOG_WARNING, "COULD NOT FIND " + filter); //$NON-NLS-1$

Back to the top