Skip to content

Commit f6a6a98

Browse files
authored
Merge branch 'eclipse-pde:master' into quickFix_verMatch_import_package
2 parents 971407a + 3347d35 commit f6a6a98

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

apitools/org.eclipse.pde.api.tools/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.pde.api.tools;singleton:=true
5-
Bundle-Version: 1.3.900.qualifier
5+
Bundle-Version: 1.3.1000.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-Localization: plugin
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Signatures.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,11 @@ public static String getTypeSignature(Type type, boolean erased) {
612612
case ASTNode.QUALIFIED_TYPE -> Signature.createTypeSignature(((QualifiedType) type).getName().getFullyQualifiedName(), false);
613613
case ASTNode.ARRAY_TYPE -> {
614614
ArrayType a = (ArrayType) type;
615-
yield Signature.createArraySignature(getTypeSignature(a.getElementType(), erased), a.getDimensions());
615+
String typeSignature = getTypeSignature(a.getElementType(), erased);
616+
if (typeSignature == null) {
617+
yield null;
618+
}
619+
yield Signature.createArraySignature(typeSignature, a.getDimensions());
616620
}
617621
// we don't need to care about the other scoping types only the base type
618622
case ASTNode.PARAMETERIZED_TYPE -> getTypeSignature(((ParameterizedType) type).getType(), erased);

0 commit comments

Comments
 (0)