Skip to content

Commit ceead63

Browse files
committed
Added a missing change from the resolution to OMG Issue FUML 12-8.
1 parent c4398f8 commit ceead63

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

org.modeldriven.fuml/src/main/java/fUML/Semantics/Activities/CompleteStructuredActivities/LoopNodeActivation.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void runBody() {
174174
this.activationGroup.runNodes(this
175175
.makeActivityNodeList(loopNode.bodyPart));
176176

177-
if (!this.isSuspended()) {
177+
if (!this.isTerminateAll & !this.isSuspended()) {
178178
this.saveBodyOutputs();
179179
}
180180
} // runBody
@@ -229,12 +229,13 @@ public void terminateAll() {
229229

230230
this.isTerminateAll = true;
231231

232-
OutputPinList resultPins = ((LoopNode) this.node).result;
233-
234-
for (int i = 0; i < bodyOutputLists.size(); i++) {
235-
Values bodyOutputList = bodyOutputLists.getValue(i);
232+
LoopNode loopNode = (LoopNode) this.node;
233+
OutputPinList bodyOutputs = loopNode.bodyOutput;
234+
OutputPinList resultPins = loopNode.result;
235+
for (int i = 0; i < bodyOutputs.size(); i++) {
236+
OutputPin bodyOutput = bodyOutputs.getValue(i);
236237
OutputPin resultPin = resultPins.getValue(i);
237-
this.putTokens(resultPin, bodyOutputList.values);
238+
this.putTokens(resultPin, this.getPinValues(bodyOutput));
238239
}
239240

240241
super.terminateAll();

0 commit comments

Comments
 (0)