From 34b30605c33927a958c70f543693e67a1ba1f831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Tue, 24 Nov 2020 09:17:52 +0100 Subject: [PATCH] Bug 569060 - All ids of target file must be different MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie098d4f5d86e9bcde6e5be9e656eefa9ac8d1b3c Signed-off-by: Christoph Läubrich --- .../tycho/p2/target/TargetDefinitionResolver.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java index 6b8399e4fc..0a22231d11 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java @@ -10,8 +10,9 @@ * Contributors: * SAP SE - initial API and implementation * Christoph Läubrich - [Bug 538144] Support other target locations (Directory, Features, Installations) - * - [Bug 533747] - Target file is read and parsed over and over again - * - [Bug 568729] - Support new "Maven" Target location + * - [Bug 533747] Target file is read and parsed over and over again + * - [Bug 568729] Support new "Maven" Target location + * - [Bug 569060] All ids of target file must be different *******************************************************************************/ package org.eclipse.tycho.p2.target; @@ -140,15 +141,9 @@ TargetDefinitionContent resolveContentWithExceptions(TargetDefinition definition List locations = new ArrayList<>(); for (Repository repository : installableUnitLocation.getRepositories()) { URI location = repository.getLocation(); - String key; - String id = repository.getId(); - if (id != null && !id.isBlank()) { - key = id; - } else { - key = location.normalize().toASCIIString(); - } + String key = location.normalize().toASCIIString(); locations.add(uriRepositories.computeIfAbsent(key, - s -> new URITargetDefinitionContent(provisioningAgent, location, id))); + s -> new URITargetDefinitionContent(provisioningAgent, location, repository.getId()))); } IQueryable locationUnits = QueryUtil.compoundQueryable(locations); installableUnitResolver.addLocation((InstallableUnitLocation) locationDefinition, locationUnits);