Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Belle2017-08-24 04:41:36 -0400
committerJan Belle2017-08-24 04:41:36 -0400
commitb8b2a3a244635c2528167699a30a82cdc0ef4890 (patch)
tree2232c8803b843f667791c24e1c217ce7ff6e40a7
parentc46d3a1a1b6d03bfa5f6cb17e0f5e7e3955e0085 (diff)
downloadorg.eclipse.etrice-b8b2a3a244635c2528167699a30a82cdc0ef4890.tar.gz
org.eclipse.etrice-b8b2a3a244635c2528167699a30a82cdc0ef4890.tar.xz
org.eclipse.etrice-b8b2a3a244635c2528167699a30a82cdc0ef4890.zip
Bug 521350 - [runtime.java] The method start of actor classes is not
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend1
-rw-r--r--plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java4
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/SubSystemClassBase.java7
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
index e80fded93..3c23c9a32 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend
@@ -230,7 +230,6 @@ class ActorClassGen extends GenericActorClassGenerator {
public abstract void stop();
«ELSE»
public void stop(){
- stopUser();
super.stop();
}
«ENDIF»
diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
index a94b81219..97efb1068 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
@@ -769,10 +769,6 @@ public class ActorClassGen extends GenericActorClassGenerator {
_builder.newLine();
_builder.append("\t");
_builder.append("\t");
- _builder.append("stopUser();");
- _builder.newLine();
- _builder.append("\t");
- _builder.append("\t");
_builder.append("super.stop();");
_builder.newLine();
_builder.append("\t");
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/SubSystemClassBase.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/SubSystemClassBase.java
index ddbd9f66a..428036964 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/SubSystemClassBase.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/modelbase/SubSystemClassBase.java
@@ -83,12 +83,17 @@ public abstract class SubSystemClassBase extends RTObject implements IEventRecei
public void start() {
- // start all actors instances
+ // execute initial transition of all actor instances
RTSystemPort.executeInitialTransition();
// start all message services
RTServices.getInstance().getMsgSvcCtrl().start();
+ // start all actors
+ for(IRTObject child : getChildren()) {
+ if(child instanceof ActorClassBase)
+ ((ActorClassBase) child).start();
+ }
}
public void stop() {

Back to the top