From ab8112ea2425342b59cfdba972ff2e0d12f30fc0 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Mon, 10 Sep 2018 19:03:42 +0530
Subject: [PATCH] Revert commit ecc271c49247604b5a6396a46ef83fc6b94be594.

---
 .../apache/ivy/core/cache/ArtifactOrigin.java | 20 -------------------
 .../cache/DefaultRepositoryCacheManager.java  |  4 ++--
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java b/src/java/org/apache/ivy/core/cache/ArtifactOrigin.java
index e2a5d47d..e65a683c 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.
      *
diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java
index 1eb562fc..91257b04 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));
     }