Skip to content

Commit 5ef4e19

Browse files
committed
Updated ActivityExecution::terminate. (OMG Issue FUML12-11/18362)
1 parent 5f36ca3 commit 5ef4e19

1 file changed

Lines changed: 4 additions & 14 deletions

File tree

org.modeldriven.fuml/src/main/java/fUML/Semantics/Activities/IntermediateActivities/ActivityExecution.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
/*
32
* Initial version copyright 2008 Lockheed Martin Corporation, except
43
* as stated in the file entitled Licensing-Information.
54
*
6-
* All modifications copyright 2009-2013 Data Access Technologies, Inc.
5+
* All modifications copyright 2009-2017 Data Access Technologies, Inc.
76
*
87
* Licensed under the Academic Free License version 3.0
98
* (http://www.opensource.org/licenses/afl-3.0.php), except as stated
@@ -13,20 +12,9 @@
1312
package fUML.Semantics.Activities.IntermediateActivities;
1413

1514
import fUML.Debug;
16-
import UMLPrimitiveTypes.*;
17-
18-
import fUML.Syntax.*;
19-
import fUML.Syntax.Classes.Kernel.*;
20-
import fUML.Syntax.CommonBehaviors.BasicBehaviors.*;
21-
import fUML.Syntax.CommonBehaviors.Communications.*;
2215
import fUML.Syntax.Activities.IntermediateActivities.*;
23-
import fUML.Syntax.Actions.BasicActions.*;
24-
25-
import fUML.Semantics.*;
2616
import fUML.Semantics.Classes.Kernel.*;
2717
import fUML.Semantics.CommonBehaviors.BasicBehaviors.*;
28-
import fUML.Semantics.Actions.BasicActions.*;
29-
import fUML.Semantics.Loci.*;
3018

3119
public class ActivityExecution extends
3220
fUML.Semantics.CommonBehaviors.BasicBehaviors.Execution {
@@ -101,7 +89,9 @@ public void terminate() {
10189
// Terminate all node activations (which will ultimately result in the
10290
// activity execution completing).
10391

104-
this.activationGroup.terminateAll();
92+
if (this.activationGroup != null) {
93+
this.activationGroup.terminateAll();
94+
}
10595
} // terminate
10696

10797
} // ActivityExecution

0 commit comments

Comments
 (0)