diff options
Diffstat (limited to 'src/main/java/sevenUnits/utils')
| -rw-r--r-- | src/main/java/sevenUnits/utils/NameSymbol.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/sevenUnits/utils/NameSymbol.java b/src/main/java/sevenUnits/utils/NameSymbol.java index 49c44fa..290dcd6 100644 --- a/src/main/java/sevenUnits/utils/NameSymbol.java +++ b/src/main/java/sevenUnits/utils/NameSymbol.java @@ -196,14 +196,18 @@ public final class NameSymbol { * of the argument * @since 2019-10-21 */ - private NameSymbol(final Optional<String> primaryName, + NameSymbol(final Optional<String> primaryName, final Optional<String> symbol, final Set<String> otherNames) { this.primaryName = primaryName; this.symbol = symbol; - otherNames.remove(null); - this.otherNames = Collections.unmodifiableSet(otherNames); + if (otherNames != null) { + otherNames.remove(null); + this.otherNames = Collections.unmodifiableSet(otherNames); + } else { + this.otherNames = Set.of(); + } - if (this.primaryName.isEmpty()) { + if (this.primaryName == null || this.primaryName.isEmpty()) { assert this.otherNames.isEmpty(); } } |