Repository: ant-ivy Updated Branches: refs/heads/master 84ad767a8 -> 080e96a6c
follow through on deprecation Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/080e96a6 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/080e96a6 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/080e96a6 Branch: refs/heads/master Commit: 080e96a6cdea2f5fe8727b8249044b89bc54395d Parents: 84ad767 Author: twogee <g.grigelio...@gmail.com> Authored: Tue Jul 25 08:00:52 2017 +0200 Committer: Jaikiran Pai <jaiki...@apache.org> Committed: Wed Jul 26 20:29:42 2017 +0530 ---------------------------------------------------------------------- .../org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java | 3 ++- src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/080e96a6/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 c0d2eb5..83f3cd1 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -889,7 +889,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv if (resolvedTime == null) { Message.verbose(getName() + ": inconsistent or old cache: no cached resolved time for " + mrid); - saveResolvedRevision(mrid, resolvedRevision); + saveResolvedRevision(expectedResolver, mrid, resolvedRevision); return resolvedRevision; } if (options.isCheckTTL()) { @@ -907,6 +907,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv } } + @Deprecated public void saveResolvedRevision(ModuleRevisionId mrid, String revision) { saveResolvedRevision(null, mrid, revision); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/080e96a6/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java index c45d4d1..71224ff 100644 --- a/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java @@ -176,6 +176,7 @@ public interface RepositoryCacheManager { * @deprecated See {@link #saveResolvedRevision(String, ModuleRevisionId, String)} which * prevents cache + * thrashing when multiple resolvers store the same dynamicMrid */ + @Deprecated void saveResolvedRevision(ModuleRevisionId dynamicMrid, String revision); /**