Skip to content

fix ClasspathComputer: ignore if oldEntry not found #820 #1601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jukzi merged 1 commit into from
Feb 6, 2025
Merged

fix ClasspathComputer: ignore if oldEntry not found #820 #1601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathComputer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ protected static IBuild getBuild(IProject project) throws CoreException {
}

private static void addLibraryEntry(IPluginLibrary library, Map<String, IPath> sourceLibraryMap,
ClasspathConfiguration context) throws JavaModelException {
ClasspathConfiguration context) {
String name = ClasspathUtilCore.expandLibraryName(library.getName());
IResource jarFile = context.javaProject.getProject().findMember(name);
if (jarFile == null) {
Expand All @@ -266,18 +266,26 @@ private static void addLibraryEntry(IPluginLibrary library, Map<String, IPath> s
boolean isExported = library.isExported();

IPackageFragmentRoot root = context.javaProject.getPackageFragmentRoot(jarFile);
if (root.exists() && root.getKind() == IPackageFragmentRoot.K_BINARY) {
IClasspathEntry oldEntry = root.getRawClasspathEntry();
// If we have the same binary root but new or different source, we
// should recreate the entry. That is when the source attachment:
// - is not defined: the default could be available now, or
// - is overridden with a different value.
if ((sourceAttachment == null && oldEntry.getSourceAttachmentPath() != null)
|| (sourceAttachment != null && sourceAttachment.equals(oldEntry.getSourceAttachmentPath()))) {
context.reloaded.add(oldEntry);
return;
try {
if (root.exists() && root.getKind() == IPackageFragmentRoot.K_BINARY) {
IClasspathEntry oldEntry = root.getRawClasspathEntry();
// If we have the same binary root but new or different source,
// we
// should recreate the entry. That is when the source
// attachment:
// - is not defined: the default could be available now, or
// - is overridden with a different value.
if ((sourceAttachment == null && oldEntry.getSourceAttachmentPath() != null)
|| (sourceAttachment != null && sourceAttachment.equals(oldEntry.getSourceAttachmentPath()))) {
context.reloaded.add(oldEntry);
return;
}
isExported = oldEntry.isExported();
}
isExported = oldEntry.isExported();
} catch (JavaModelException ignored) {
// For example ELEMENT_NOT_ON_CLASSPATH is expected when
// rawclasspath was changed manually.
// In any case PDE can not solve any issue beside ignoring it.
}
reloadClasspathEntry(jarFile, name, sourceAttachment, isExported, context);
}
Expand Down
Loading