Clean up MCC table caching

Author: bbimber

mcc/src/org/labkey/mcc/query/TriggerHelper.java

@@ -281,16 +281,14 @@ public void possiblySendRabNotification(int reviewerId)
         }
     }
 
-    private TableInfo _mappingTable = null;
-
     private TableInfo getMappingTable()
     {
-        if (_mappingTable == null)
+        if (_animalMapping == null)
         {
-            _mappingTable = QueryService.get().getUserSchema(_user, _container, MccSchema.NAME).getTable(MccSchema.TABLE_ANIMAL_MAPPING);
+            _animalMapping = QueryService.get().getUserSchema(_user, _container, MccSchema.NAME).getTable(MccSchema.TABLE_ANIMAL_MAPPING);
         }
 
-        return _mappingTable;
+        return _animalMapping;
     }
 
     public @Nullable String getMccAlias(String id) {
@@ -299,6 +297,8 @@ private TableInfo getMappingTable()
 
     public int ensureMccAliasExists(Collection<String> rawIds, Map<Object, Object> existingAliases)
     {
+        clearCachedTables();
+
         // NOTE: The incoming object can convert numeric IDs from strings to int, so manually convert:
         // Also, CaseInsensitiveSet will convert the keys to lowercase, which is problematic for case-sensitive databases
         final CaseInsensitiveHashMap<String> idMap = new CaseInsensitiveHashMap<>();
@@ -391,4 +391,9 @@ public void updateDemographicsColony(String Id, String destination) throws Excep
             throw bve;
         }
     }
+
+    public void clearCachedTables()
+    {
+        _animalMapping = null;
+    }
 }