Merge f4ee837 into 7c2c5a2

JuliaIO · Oct 24, 2020 · b729579 · b729579
2 parents 7c2c5a2 + f4ee837
commit b729579
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/loadsave.jl b/src/loadsave.jl
@@ -1,5 +1,6 @@
 const sym2loader = Dict{Symbol,Vector{Symbol}}()
 const sym2saver  = Dict{Symbol,Vector{Symbol}}()
+const load_locker = Base.ReentrantLock()
 
 is_installed(pkg::Symbol) = get(Pkg.installed(), string(pkg), nothing) != nothing
 
@@ -16,19 +17,21 @@ function topimport(modname)
 end
 
 function checked_import(pkg::Symbol)
-    # kludge for test suite
-    if isdefined(Main, pkg)
-        m1 = getfield(Main, pkg)
-        isa(m1, Module) && return m1
-    end
-    if isdefined(FileIO, pkg)
-        m1 = getfield(FileIO, pkg)
-        isa(m1, Module) && return m1
+    lock(load_locker) do
+        # kludge for test suite
+        if isdefined(Main, pkg)
+            m1 = getfield(Main, pkg)
+            isa(m1, Module) && return m1
+        end
+        if isdefined(FileIO, pkg)
+            m1 = getfield(FileIO, pkg)
+            isa(m1, Module) && return m1
+        end
+        m = _findmod(pkg)
+        m == nothing || return Base.loaded_modules[m]
+        topimport(pkg)
+        return Base.loaded_modules[_findmod(pkg)]
     end
-    m = _findmod(pkg)
-    m == nothing || return Base.loaded_modules[m]
-    topimport(pkg)
-    return Base.loaded_modules[_findmod(pkg)]
 end