Evict bad bundles from the bundle pool

Currently if there is a bad bundle in the bundle pool it is very hard to
get rid of it. Deleting it directly will lead to a file not found
exception and the pool is completely broken without deeper knowledge of
the user p internal data structures.

This now checks if the bundle is currently loaded from the bundle pool
and if it is failing evict it from the pool so it can be downloaded
fresh on the next request.

Author: laeubi

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java

@@ -507,9 +507,8 @@ private void generateBundle(IInstallableUnit unit, IFileArtifactRepository repo,
 			if( file == null){
 				file = repo.getArtifactFile(artifactKey);
 				if (file != null) {
-					Map<IFileArtifactRepository, File> repoFile = new ConcurrentHashMap<>();
-					repoFile.put(repo, file);
-					P2TargetUtils.fgArtifactKeyRepoFile.putIfAbsent(artifactKey, repoFile);
+					P2TargetUtils.fgArtifactKeyRepoFile.computeIfAbsent(artifactKey, nil -> new ConcurrentHashMap<>())
+							.put(repo, file);
 				}
 			}
 			if (file != null) {
@@ -522,6 +521,17 @@ private void generateBundle(IInstallableUnit unit, IFileArtifactRepository repo,
 					info.setVersion(artifactKey.getVersion().toString());
 					InvalidTargetBundle invalidTargetBundle = new InvalidTargetBundle(info, e.getStatus());
 					bundles.put(info, invalidTargetBundle);
+					if (mapRepoFile != null) {
+						// remove invalid file from the cache...
+						mapRepoFile.remove(repo);
+					}
+					if (repo.isModifiable() && P2TargetUtils.isBundlePool(repo)) {
+						try {
+							repo.removeDescriptor(artifactKey, new NullProgressMonitor());
+						} catch (RuntimeException ignored) {
+							// better safe than sorry!
+						}
+					}
 				}
 			}
 		}

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/P2TargetUtils.java

@@ -107,8 +107,12 @@
 
 public class P2TargetUtils {
 
+	private static final String BUNDLE_POOL_SUFFIX = ".bundle_pool"; //$NON-NLS-1$
+
 	private static final String SOURCE_IU_ID = "org.eclipse.pde.core.target.source.bundles"; //$NON-NLS-1$
 
+	private static final String BUNDLE_POOL_REPO_NAME = "PDE Target Bundle Pool"; //$NON-NLS-1$
+
 	/**
 	 * URI to the local directory where the p2 agent keeps its information.
 	 */
@@ -125,7 +129,7 @@ public class P2TargetUtils {
 	 * Path to the local directory where the local bundle pool is stored for p2 profile
 	 * based targets.
 	 */
-	public static final IPath BUNDLE_POOL = PDECore.getDefault().getStateLocation().append(".bundle_pool"); //$NON-NLS-1$
+	public static final IPath BUNDLE_POOL = PDECore.getDefault().getStateLocation().append(BUNDLE_POOL_SUFFIX);
 
 	/**
 	 * Path to the local directory where install folders are created for p2 profile
@@ -451,11 +455,29 @@ public static IFileArtifactRepository getBundlePool() throws CoreException {
 		} catch (CoreException e) {
 			// could not load or there wasn't one, fall through to create
 		}
-		String repoName = "PDE Target Bundle Pool"; //$NON-NLS-1$
-		IArtifactRepository result = manager.createRepository(uri, repoName, IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
+		IArtifactRepository result = manager.createRepository(uri, BUNDLE_POOL_REPO_NAME,
+				IArtifactRepositoryManager.TYPE_SIMPLE_REPOSITORY, null);
 		return (IFileArtifactRepository) result;
 	}
 
+	public static boolean isBundlePool(IFileArtifactRepository repository) {
+		if (repository == null) {
+			return false;
+		}
+		URI location = repository.getLocation();
+		if (location == null) {
+			return false;
+		}
+		if (!"file".equals(location.getScheme())) { //$NON-NLS-1$
+			return false;
+		}
+		String path = location.getPath();
+		if (path.endsWith("/")) { //$NON-NLS-1$
+			path = path.substring(0, path.length() - 1);
+		}
+		return path.endsWith(BUNDLE_POOL_SUFFIX);
+	}
+
 	/**
 	 * Returns the provisioning engine service.
 	 *