Merge pull request #11 from bimberlabinternal/fb_merge_discvr-20.11

bbimber · web-flow · commit 10f6ef8719d5 · 2021-03-26T10:11:08.000-07:00
Merge discvr-20.11 to discvr-21.3
diff --git a/laboratory/api-src/org/labkey/api/laboratory/QueryImportNavItem.java b/laboratory/api-src/org/labkey/api/laboratory/QueryImportNavItem.java
@@ -48,7 +48,7 @@ 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;
+        _queryCache = cache == null ? new QueryCache() : cache;
     }
 
     public QueryImportNavItem(DataProvider provider, Container targetContainer, String schema, String query, LaboratoryService.NavItemCategory itemType, String label, String reportCategory)

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public QueryImportNavItem(DataProvider provider, String schema, String query, La`
`48`	`48`	`public QueryImportNavItem(DataProvider provider, String schema, String query, String label, LaboratoryService.NavItemCategory itemType, String reportCategory, QueryCache cache)`
`49`	`49`	`{`
`50`	`50`	`this(provider, null, schema, query, itemType, label, reportCategory);`
`51`		`- _queryCache = cache;`
	`51`	`+ _queryCache = cache == null ? new QueryCache() : cache;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public QueryImportNavItem(DataProvider provider, Container targetContainer, String schema, String query, LaboratoryService.NavItemCategory itemType, String label, String reportCategory)`