Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-05-28 17:56:27 +0000
committerslewis2008-05-28 17:56:27 +0000
commitba40ead813f28c55dca40322f79d263703f4d4dd (patch)
treea9492ae6c9a9cf7f482d72bed64bc56baab3bb06
parenta0b7a6a4d7250b1cd1c6c14e3425bc6a415d4111 (diff)
downloadorg.eclipse.ecf-ba40ead813f28c55dca40322f79d263703f4d4dd.tar.gz
org.eclipse.ecf-ba40ead813f28c55dca40322f79d263703f4d4dd.tar.xz
org.eclipse.ecf-ba40ead813f28c55dca40322f79d263703f4d4dd.zip
Fix for r-osgi NPE on TCPChannelFactory.deactivate. bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=234444
-rw-r--r--protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java
index 777eebb5c..aeb1ed415 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/src/main/java/ch/ethz/iks/r_osgi/impl/TCPChannelFactory.java
@@ -88,7 +88,8 @@ final class TCPChannelFactory implements NetworkChannelFactory {
* @see ch.ethz.iks.r_osgi.channels.NetworkChannelFactory#deactivate(ch.ethz.iks.r_osgi.Remoting)
*/
public void deactivate(final Remoting remoting) throws IOException {
- thread.interrupt();
+ if (thread != null)
+ thread.interrupt();
this.remoting = null;
}

Back to the top