Set methods with null return type to have "void" return type

Addresses NPE in JavaSearchTests.testEnum04 Signed-off-by: David Thompson <[email protected]>
mickaelistria · Feb 8, 2024 · 165c429 · 165c429
1 parent 93f71b4
commit 165c429
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DOMToModelPopulator.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DOMToModelPopulator.java
@@ -311,8 +311,12 @@ public boolean visit(MethodDeclaration method) {
 		info.arguments = ((List<SingleVariableDeclaration>)method.parameters()).stream()
 			.map(this::toLocalVariable)
 			.toArray(LocalVariable[]::new);
-		if (method.getAST().apiLevel() > 2 && method.getReturnType2() != null) {
-			info.setReturnType(method.getReturnType2().toString().toCharArray());
+		if (method.getAST().apiLevel() > 2) {
+			if (method.getReturnType2() != null) {
+				info.setReturnType(method.getReturnType2().toString().toCharArray());
+			} else {
+				info.setReturnType("void".toCharArray()); //$NON-NLS-1$
+			}
 		}
 		info.setSourceRangeStart(method.getStartPosition());
 		info.setSourceRangeEnd(method.getStartPosition() + method.getLength() - 1);