Skip to content
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

Jump to bottom

Synchronize on the manager in RepositoryHelper#createMemoryComposite #415

Merged
merged 1 commit into from
Dec 16, 2023
Merged

Synchronize on the manager in RepositoryHelper#createMemoryComposite #415

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 26 additions & 18 deletions ...2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/RepositoryHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.LongStream;
import java.util.stream.Stream;
import org.eclipse.core.runtime.*;
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
Expand Down Expand Up @@ -131,24 +130,33 @@ public static <T> IRepository<T> createMemoryComposite(IProvisioningAgent agent,
if (manager == null) {
return null;
}
try {
// create a unique URI
URI repositoryURI = LongStream.iterate(System.currentTimeMillis(), t -> t + 1)
.mapToObj(t -> URI.create("memory:" + t)) //$NON-NLS-1$
.dropWhile(manager::contains).findFirst().orElseThrow();
IRepository<T> result = manager.createRepository(repositoryURI, repositoryURI.toString(), repositoryType,
null);
manager.removeRepository(repositoryURI);
return result;
} catch (ProvisionException e) {
LogHelper.log(e);
// just return null
} catch (IllegalArgumentException e) {
if (!(e.getCause() instanceof URISyntaxException)) {
throw e; // not thrown by the URI creation above
} // else just return null
synchronized (manager) {
// one must synchronize here because even if we check that the manager does not
// contain a repository, it is still possible that two threads perform the
// check at the same time! This will result in both threads see "not exits",
// then both try to create the repos and one of them will fail
URI repositoryURI;
do {
try {
repositoryURI = new URI("memory:" + UUID.randomUUID()); //$NON-NLS-1$
} catch (URISyntaxException e) {
// if we can't create the URI we are all lost...
return null;
}
// very unlikely but check if the manager already has this one and the generate
// a fresh one...
} while (manager.contains(repositoryURI));

try {
IRepository<T> result = manager.createRepository(repositoryURI, repositoryURI.toString(),
repositoryType, null);
manager.removeRepository(repositoryURI);
return result;
} catch (ProvisionException e) {
LogHelper.log(e);
}
return null;
}
return null;
}

/**
Expand Down