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);