From 705b5d39497cdb723d1da36e23fbcf45b3199f69 Mon Sep 17 00:00:00 2001 From: Arthur Daussy Date: Thu, 11 Jun 2026 17:05:08 +0200 Subject: [PATCH] ST6RI-938 Fix NPE on InstantiationExpression.instantiatedType Signed-off-by: Arthur Daussy --- ...iationExpression_instantiatedType_InvocationDelegate.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java index 1eb349fd0..2f3fbcf57 100644 --- a/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/delegate/invocation/InstantiationExpression_instantiatedType_InvocationDelegate.java @@ -1,7 +1,8 @@ /******************************************************************************* * SysML 2 Pilot Implementation * Copyright (c) 2025 Model Driven Solutions, Inc. - * + * Copyright (c) 2026 Obeo + * * This program is free software: you can redistribute it and/or modify * it under the terms of the Eclipse Public License as published by * the Eclipse Foundation, version 2 of the License. @@ -21,6 +22,7 @@ package org.omg.sysml.delegate.invocation; import java.lang.reflect.InvocationTargetException; +import java.util.Objects; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EOperation; @@ -43,6 +45,7 @@ public Object dynamicInvoke(InternalEObject target, EList arguments) throws I Element member =self.getOwnedMembership().stream(). filter(m->!(m instanceof FeatureMembership)). map(Membership::getMemberElement). + filter(Objects::nonNull). findFirst().orElse(null); return member instanceof Type? member: null; }