Skip to content

Commit d62ff99

Browse files
committed
ST6RI-913 Updated FeatureAdapter.computeValueConnector to avoid NPE.
1 parent c4abbd9 commit d62ff99

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,11 @@ protected void computeValueConnector() {
822822
if (FeatureUtil.getValuationFor(target).isInitial()) {
823823
Feature that = (Feature)getLibraryType("Base::things::that");
824824
Feature startShot = (Feature)getLibraryType("Occurrences::Occurrence::startShot");
825-
featuringTypes = Collections.singletonList(FeatureUtil.chainFeatures(that, startShot));
825+
if (that != null && startShot != null) {
826+
featuringTypes = Collections.singletonList(FeatureUtil.chainFeatures(that, startShot));
827+
} else {
828+
featuringTypes = target.getFeaturingType();
829+
}
826830
} else {
827831
featuringTypes = target.getFeaturingType();
828832
}

0 commit comments

Comments
 (0)