diff options
| author | Rich Hickey <richhickey@gmail.com> | 2008-11-30 12:58:30 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2008-11-30 12:58:30 +0000 |
| commit | 30a56dfc56d2c65d5c7c3a14c8fe8c6f43548657 (patch) | |
| tree | 706d29ca0213fb5e30fd401fe862abfb865a3d58 /src | |
| parent | 3cee77a74c9d00604535d4e39292e6c40330c13b (diff) | |
made nested load of already loading resource a no-op instead of a throw
Diffstat (limited to 'src')
| -rw-r--r-- | src/clj/clojure/core.clj | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj index 0d1eb723..054d3505 100644 --- a/src/clj/clojure/core.clj +++ b/src/clj/clojure/core.clj @@ -3352,11 +3352,12 @@ (when *loading-verbosely* (printf "(clojure.core/load \"%s\")\n" path) (flush)) - (throw-if (*pending-paths* path) - "cannot load '%s' again while it is loading" - path) - (binding [*pending-paths* (conj *pending-paths* path)] - (clojure.lang.RT/load (.substring path 1)))))) +; (throw-if (*pending-paths* path) +; "cannot load '%s' again while it is loading" +; path) + (when-not (*pending-paths* path) + (binding [*pending-paths* (conj *pending-paths* path)] + (clojure.lang.RT/load (.substring path 1))))))) (defn compile "Compiles the namespace named by the symbol lib into a set of |