Repository: ant-ivy Updated Branches: refs/heads/master 969ba77e9 -> 0712acabd
Revert commit ecc271c49247604b5a6396a46ef83fc6b94be594. Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/ab8112ea Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/ab8112ea Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/ab8112ea Branch: refs/heads/master Commit: ab8112ea2425342b59cfdba972ff2e0d12f30fc0 Parents: 969ba77 Author: Jaikiran Pai <[email protected]> Authored: Mon Sep 10 19:03:42 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Mon Sep 10 19:03:42 2018 +0530 ---------------------------------------------------------------------- .../apache/ivy/core/cache/ArtifactOrigin.java | 20 -------------------- .../cache/DefaultRepositoryCacheManager.java | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ab8112ea/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java b/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java index e2a5d47..e65a683 100644 --- a/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java +++ b/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java @@ -20,9 +20,6 @@ package org.apache.ivy.core.cache; import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.util.Checks; -import java.net.MalformedURLException; -import java.net.URL; - /** * This class contains information about the origin of an artifact. * @@ -113,23 +110,6 @@ public class ArtifactOrigin { this.location = location; } - // the "location" of an ArtifactOrigin is expected to be URL. However, - // in certain versions of Ivy we used to save just the path as the location - // instead of the URL form. Here we try and read it as a URL. If it can be - // read as a URL, we return the URL#getPath. However, if it can't be read - // as a URL, then considering backward compatibility, we treat the "location" - // as a path and return it back. - String getLocationPath() { - if (this.location == null) { - return null; - } - try { - return new URL(this.location).getPath(); - } catch (MalformedURLException e) { - return this.location; - } - } - /** * Return the artifact that this location is pointing at. * http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/ab8112ea/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java index 1eb562f..91257b0 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -384,7 +384,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv public File getArchiveFileInCache(Artifact artifact, ArtifactOrigin origin) { File archive = new File(getRepositoryCacheRoot(), getArchivePathInCache(artifact, origin)); if (!archive.exists() && !ArtifactOrigin.isUnknown(origin) && origin.isLocal()) { - File original = Checks.checkAbsolute(origin.getLocationPath(), artifact + File original = Checks.checkAbsolute(origin.getLocation(), artifact + " origin location"); if (original.exists()) { return original; @@ -406,7 +406,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv */ private File getArchiveFileInCache(Artifact artifact, ArtifactOrigin origin, boolean useOrigin) { if (useOrigin && !ArtifactOrigin.isUnknown(origin) && origin.isLocal()) { - return Checks.checkAbsolute(origin.getLocationPath(), artifact + " origin location"); + return Checks.checkAbsolute(origin.getLocation(), artifact + " origin location"); } return new File(getRepositoryCacheRoot(), getArchivePathInCache(artifact, origin)); }
