From 0851bac5e682aed90fb1a7c57f40e22ae74ba09e Mon Sep 17 00:00:00 2001
From: Herb vd Dool <herb@3speedhub.com>
Date: Mon, 7 Oct 2019 09:37:34 -0400
Subject: [PATCH] move the try catch

---
 CRM/Extension/Mapper.php | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/CRM/Extension/Mapper.php b/CRM/Extension/Mapper.php
index 3aeb3a2825..df38b02fff 100644
--- a/CRM/Extension/Mapper.php
+++ b/CRM/Extension/Mapper.php
@@ -301,22 +301,11 @@ class CRM_Extension_Mapper {
         if (!empty($compat[$dao->full_name]['force-uninstall'])) {
           continue;
         }
-        try {
-          $moduleExtensions[] = [
-            'prefix' => $dao->file,
-            'filePath' => $dao->full_name,
-          ];
-        }
-        catch (CRM_Extension_Exception $e) {
-          // Putting a stub here provides more consistency
-          // in how getActiveModuleFiles when racing between
-          // dirty file-removals and cache-clears.
-          CRM_Core_Session::setStatus($e->getMessage(), '', 'error');
-          $moduleExtensions[] = [
-            'prefix' => $dao->file,
-            'filePath' => NULL,
-          ];
-        }
+        $moduleExtensions[] = [
+          'prefix' => $dao->file,
+          'fullName' => $dao->full_name,
+          'filePath' => NULL,
+        ];
       }
 
       if ($this->cache) {
@@ -326,7 +315,16 @@ class CRM_Extension_Mapper {
 
     // Since we're not caching the full path we add it now.
     array_walk($moduleExtensions, function(&$value, $key) {
-      $value['filePath'] = $this->keyToPath($value['filePath']);
+      try {
+        $value['filePath'] = $this->keyToPath($value['fullName']);
+      }
+      catch (CRM_Extension_Exception $e) {
+        // Putting a stub here provides more consistency
+        // in how getActiveModuleFiles when racing between
+        // dirty file-removals and cache-clears.
+        CRM_Core_Session::setStatus($e->getMessage(), '', 'error');
+        $value['filePath'] = NULL;
+      }
     });
 
     return $moduleExtensions;
-- 
2.25.1