Skip to content

Commit b2a0bae

Browse files
authored
Merge pull request #680 from Systems-Modeling/ST6RI-868
ST6RI-868 Coding error in delegate for Membership::isDistinguishableFrom operation
2 parents 1385fb6 + f02e155 commit b2a0bae

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

org.omg.sysml/src/org/omg/sysml/delegate/invocation/Membership_isDistinguishableFrom_InvocationDelegate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* SysML 2 Pilot Implementation
3-
* Copyright (c) 2024 Model Driven Solutions, Inc.
3+
* Copyright (c) 2024, 2025 Model Driven Solutions, Inc.
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
@@ -47,12 +47,12 @@ public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws I
4747
String otherShortName = other.getMemberShortName();
4848
String otherName = other.getMemberName();
4949
if (memberShortName != null) {
50-
if (memberShortName == otherShortName || memberShortName == otherName) {
50+
if (memberShortName.equals(otherShortName) || memberShortName.equals(otherName)) {
5151
return false;
5252
}
5353
}
54-
if (memberName == null) {
55-
if (memberName == otherShortName || memberName == otherName) {
54+
if (memberName != null) {
55+
if (memberName.equals(otherShortName) || memberName.equals(otherName)) {
5656
return false;
5757
}
5858
}

0 commit comments

Comments
 (0)