ClasspathMultiDirectory: cache the missing Package

As in ClasspathDirectory. Reduces calls to Container.findMember(String) for example in org.eclipse.jdt.core.tests.model.ModuleBuilderTests.test008()
eclipse-jdt · Jan 23, 2025 · b47b6be · b47b6be
1 parent 8050026
commit b47b6be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathDirectory.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathDirectory.java
@@ -108,8 +108,8 @@ String[] directoryList(String qualifiedPackageName) {
 
 	try {
 		IResource container = this.binaryFolder.findMember(qualifiedPackageName); // this is a case-sensitive check
-		if (container instanceof IContainer) {
-			IResource[] members = ((IContainer) container).members();
+		if (container instanceof IContainer binaryContainer) {
+			IResource[] members = binaryContainer.members();
 			dirList = new String[members.length];
 			int index = 0;
 			for (IResource m : members) {

diff --git a/...eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathMultiDirectory.java b/...eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathMultiDirectory.java
@@ -77,12 +77,13 @@ protected boolean isExcluded(IResource resource) {
 @Override
 String[] directoryList(String qualifiedPackageName) {
 	String[] dirList = this.directoryCache.get(qualifiedPackageName);
+	if (dirList == this.missingPackageHolder) return null; // package exists in another classpath directory or jar
 	if (dirList != null) return dirList;
 
 	try {
 		IResource container = this.binaryFolder.findMember(qualifiedPackageName); // this is a case-sensitive check
-		if (container instanceof IContainer) {
-			IResource[] members = ((IContainer) container).members();
+		if (container instanceof IContainer binaryContainer) {
+			IResource[] members = binaryContainer.members();
 			dirList = new String[members.length];
 			int index = 0;
 			boolean foundClass = false;
@@ -99,8 +100,8 @@ String[] directoryList(String qualifiedPackageName) {
 			}
 			if(!foundClass) {
 				container = this.sourceFolder.findMember(qualifiedPackageName);
-				if (container instanceof IContainer) {
-					members = ((IContainer) container).members();
+				if (container instanceof IContainer sourceContainer) {
+					members = sourceContainer.members();
 					if (members.length > 0) {
 						dirList = new String[members.length];
 						index = 0;
@@ -123,6 +124,7 @@ String[] directoryList(String qualifiedPackageName) {
 	} catch(CoreException ignored) {
 		// ignore
 	}
+	this.directoryCache.put(qualifiedPackageName, this.missingPackageHolder);
 	return null;
 }