Prevent concurrent reads as well.

pkg/runtime/internal/envdef/collection.go

@@ -26,6 +26,10 @@ func New() *Collection {
 }
 
 func (c *Collection) Load(path string) (*EnvironmentDefinition, error) {
+	// Prevent concurrent reads and writes
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
 	if envDef, ok := c.raw.EnvDefs[path]; ok {
 		return envDef, nil
 	}
@@ -35,23 +39,19 @@ func (c *Collection) Load(path string) (*EnvironmentDefinition, error) {
 		return nil, errs.Wrap(err, "Failed to initialize environment definition")
 	}
 
-	// Prevent concurrent writes
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
 	c.raw.EnvDefs[path] = envDef
 	return envDef, nil
 }
 
 func (c *Collection) Unload(path string) error {
+	// Prevent concurrent reads and writes
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
 	if _, ok := c.raw.EnvDefs[path]; !ok {
 		return errs.New("Environment definition not found for path: %s", path)
 	}
 
-	// Prevent concurrent writes
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
 	delete(c.raw.EnvDefs, path)
 
 	return nil