CLJS-590: NPE when using :source-map with :whitespace optimizations

clojure · Sep 18, 2013 · ba475ed · ba475ed
1 parent a2ba719
commit ba475ed
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/clj/cljs/closure.clj b/src/clj/cljs/closure.clj
@@ -722,12 +722,13 @@
             (loop [sources (seq sources)
                    merged (sorted-map-by
                             (sm/source-compare
-                              (map (fn [source]
-                                     (if-let [^URL source-url (:source-url source)]
-                                       (.getPath source-url)
-                                       (let [^URL url (:url source)]
-                                         (.getPath url))))
-                                   sources)))]
+                              (remove nil?
+                                (map (fn [source]
+                                       (if-let [^URL source-url (:source-url source)]
+                                         (.getPath source-url)
+                                         (if-let [^URL url (:url source)]
+                                           (.getPath url))))
+                                  sources))))]
               (if sources
                 (let [source (first sources)]
                   (recur (next sources)