From 0f957ae4f06bc1a134791b7e4cfd0a9fe0ff75f2 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 23 Apr 2020 11:12:23 -0700
Subject: [PATCH] Fix bug in super interface resolving

See:
 - https://github.com/spring-projects/sts4/commit/a873fcf7eea3aff485a9344c3be8eb8674c86452#commitcomment-38607082
 - https://www.pivotaltracker.com/n/projects/1346850
---
 .../.project                                                | 6 ------
 .../tooling/jdt/ls/commons/java/JavaData.java               | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/.project b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/.project
index b42c3b9ce..7919b232d 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/.project
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/.project
@@ -20,14 +20,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java
index db84c28bf..8b80817d2 100644
--- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java
+++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/java/JavaData.java
@@ -509,6 +509,7 @@ public class JavaData {
 					resolved[i] = names[i];
 				}
 			}
+			return resolved;
 		}
 		return null;
 	}