Merge pull request #12 from bimberlabinternal/fb_merge_discvr-20.11

Merge discvr-20.11 to discvr-21.3

Author: bbimber

laboratory/api-src/org/labkey/api/laboratory/QueryImportNavItem.java

@@ -48,7 +48,8 @@ public QueryImportNavItem(DataProvider provider, String schema, String query, La
     public QueryImportNavItem(DataProvider provider, String schema, String query, String label, LaboratoryService.NavItemCategory itemType, String reportCategory, QueryCache cache)
     {
         this(provider, null, schema, query, itemType, label, reportCategory);
-        _queryCache = cache == null ? new QueryCache() : cache;
+        if (cache != null)
+            _queryCache = cache;
     }
 
     public QueryImportNavItem(DataProvider provider, Container targetContainer, String schema, String query, LaboratoryService.NavItemCategory itemType, String label, String reportCategory)

laboratory/api-src/org/labkey/api/laboratory/QueryTabbedReportItem.java

@@ -34,7 +34,8 @@ public class QueryTabbedReportItem extends TabbedReportItem
     public QueryTabbedReportItem(QueryCache cache, DataProvider provider, String schemaName, String queryName, String label, String reportCategory)
     {
         super(provider, queryName, label, reportCategory);
-        _queryCache = cache;
+        if (cache != null)
+            _queryCache = cache;
         _schemaName = schemaName;
         _queryName = queryName;
     }