Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-09-24 08:44:53 -0400
committerHenrik Rentz-Reichert2013-09-24 08:44:53 -0400
commit5e19bc6778f987311cc9214518cd42b68a6e523b (patch)
treea922c839da7c31aa0fb8bb81029b9868f4fb8648 /runtime/org.eclipse.etrice.runtime.java/src/org/eclipse
parent76501511fac4cddaf4e7e347fbeae3c7c714db69 (diff)
downloadorg.eclipse.etrice-5e19bc6778f987311cc9214518cd42b68a6e523b.tar.gz
org.eclipse.etrice-5e19bc6778f987311cc9214518cd42b68a6e523b.tar.xz
org.eclipse.etrice-5e19bc6778f987311cc9214518cd42b68a6e523b.zip
[runtime.java] Bug 417912: check thread of message service before trying to join
https://bugs.eclipse.org/417912
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.java/src/org/eclipse')
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceController.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceController.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceController.java
index 53e5092bb..709cca82a 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceController.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/messaging/MessageServiceController.java
@@ -116,6 +116,9 @@ public class MessageServiceController {
public void waitTerminate() {
for (IMessageService msgSvc : messageServices.values()) {
try {
+ if (msgSvc.getThread()==null)
+ continue;
+
msgSvc.getThread().join(1000); // wait at most 1000ms
if (msgSvc.getThread().isAlive())
System.out.println("### Message Service "

Back to the top