diff options
| author | Pascal Rapicault | 2010-09-01 16:39:27 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2010-09-01 16:39:27 +0000 |
| commit | 937b336cd746da24da8a4f88107105f40503941d (patch) | |
| tree | b739db826cc242e5f78618e653137e2eaa1f345d /bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java | |
| parent | 7436683ee5e3a9ed0e831651576563b594c1ac1b (diff) | |
| download | rt.equinox.p2-937b336cd746da24da8a4f88107105f40503941d.tar.gz rt.equinox.p2-937b336cd746da24da8a4f88107105f40503941d.tar.xz rt.equinox.p2-937b336cd746da24da8a4f88107105f40503941d.zip | |
Bug 317760 - SimpleArtifactRepository behaviour change
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java index 7e7494c34..5a02762fd 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/simple/SimpleArtifactRepository.java @@ -679,15 +679,15 @@ public class SimpleArtifactRepository extends AbstractArtifactRepository impleme } public synchronized URI getLocation(IArtifactDescriptor descriptor) { - if (flatButPackedEnabled(descriptor)) { - return getLocationForPackedButFlatArtifacts(descriptor); - } - // if the artifact has a uuid then use it String uuid = descriptor.getProperty(ARTIFACT_UUID); if (uuid != null) return blobStore.fileFor(bytesFromHexString(uuid)); + if (flatButPackedEnabled(descriptor)) { + return getLocationForPackedButFlatArtifacts(descriptor); + } + try { // if the artifact is just a reference then return the reference location if (descriptor instanceof SimpleArtifactDescriptor) { |