From d1ed9f83fe603d4baa7673e82836a0b2904f4f51 Mon Sep 17 00:00:00 2001 From: Jim Crossley Date: Tue, 22 Apr 2014 20:09:13 -0400 Subject: [PATCH] Prevent NPE when pedantic encounters dupe top-level deps to fix #1498 --- leiningen-core/src/leiningen/core/classpath.clj | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/leiningen-core/src/leiningen/core/classpath.clj b/leiningen-core/src/leiningen/core/classpath.clj index 1ffd589e..8bb84dc9 100644 --- a/leiningen-core/src/leiningen/core/classpath.clj +++ b/leiningen-core/src/leiningen/core/classpath.clj @@ -220,14 +220,15 @@ (message-for (conj parents node))) (defn- exclusion-for-range [node parents] - (let [top-level (second parents) - excluded-artifact (.getArtifact (.getDependency node)) - exclusion (Exclusion. (.getGroupId excluded-artifact) - (.getArtifactId excluded-artifact) "*" "*") - exclusion-set (into #{exclusion} (.getExclusions - (.getDependency top-level))) - with-exclusion (.setExclusions (.getDependency top-level) exclusion-set)] - (dependency-str with-exclusion))) + (if-let [top-level (second parents)] + (let [excluded-artifact (.getArtifact (.getDependency node)) + exclusion (Exclusion. (.getGroupId excluded-artifact) + (.getArtifactId excluded-artifact) "*" "*") + exclusion-set (into #{exclusion} (.getExclusions + (.getDependency top-level))) + with-exclusion (.setExclusions (.getDependency top-level) exclusion-set)] + (dependency-str with-exclusion)) + "")) (defn- message-for-range [{:keys [node parents]}] (str (message-for (conj parents node) :constraints) "\n"