Skip to content
Snippets Groups Projects
Commit f9eafab3 authored by Simon Barner's avatar Simon Barner
Browse files

Avoid NPE for DerivedAnnotations not backed by an EStructuralFeature


Issue-Ref: 4138
Issue-Url: #4138

Signed-off-by: default avatarSimon Barner <barner@fortiss.org>
parent 4832f7e2
No related branches found
No related tags found
1 merge request!1434138: Avoid NPE for DerivedAnnotations not backed by an EStructuralFeature
Pipeline #30837 passed
Pipeline: maven-releng

#30838

    AnnotationInstSpec.java b4f2ed47a8984e751e04049de5bdb3cad2c0a933 GREEN AnnotationInstSpec.java b4f2ed47a8984e751e04049de5bdb3cad2c0a933 GREEN
    DerivedAnnotationValueProviderBase.java afedd21d3469127bbb20adb34c191b5c9c980f6c GREEN DerivedAnnotationValueProviderBase.java afedd21d3469127bbb20adb34c191b5c9c980f6c GREEN
    EStructuralFeatureDescriptor.java 416e3cd900151e538922539b0b466908a1cf4639 GREEN EStructuralFeatureDescriptor.java f27e01608d167f4e02bcfe61a8eafa823675fbee YELLOW
    EStructuralFeatureValueProviderBase.java 287facbbce47c16d892bae82a214f64ceeef2263 GREEN EStructuralFeatureValueProviderBase.java 287facbbce47c16d892bae82a214f64ceeef2263 GREEN
    IAnnotationValueProvider.java 08e0e5f66dc97865e9ac03e1ac646af332845e14 GREEN IAnnotationValueProvider.java 08e0e5f66dc97865e9ac03e1ac646af332845e14 GREEN
    ValueProviderBase.java e4e866840845346ec99a4304048f5327c4890996 GREEN ValueProviderBase.java e4e866840845346ec99a4304048f5327c4890996 GREEN
    ...@@ -159,7 +159,8 @@ public class EStructuralFeatureDescriptor { ...@@ -159,7 +159,8 @@ public class EStructuralFeatureDescriptor {
    */ */
    public EClassifier getEType(IAnnotatedSpecification specification) { public EClassifier getEType(IAnnotatedSpecification specification) {
    try { try {
    return getEStructuralFeature(specification).getEType(); EStructuralFeature esf = getEStructuralFeature(specification);
    return esf != null ? esf.getEType() : null;
    } catch(Exception e) { } catch(Exception e) {
    return null; return null;
    } }
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment