From d7a31a31fe570cc2c98e82e8bd79af10892f9f7b Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 23 Apr 2019 11:02:55 -0700 Subject: [PATCH] Issue 37313: executeSql() API calls for R and Javascript generate NPE exception when running against Microarray assay --- .../src/org/labkey/microarray/query/MicroarrayUserSchema.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java b/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java index dbf0eca54e..ba94119363 100644 --- a/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java +++ b/microarray/src/org/labkey/microarray/query/MicroarrayUserSchema.java @@ -142,7 +142,7 @@ public QueryView createView(ViewContext context, QuerySettings settings, BindExc } QueryView ret = super.createView(context, settings, errors); - if (queryName.equalsIgnoreCase(TABLE_FEATURE_ANNOTATION)) + if (ret != null && TABLE_FEATURE_ANNOTATION.equalsIgnoreCase(queryName)) { // NOTE FeatureAnnotationSetQueryView handles this for TABLE_FEATURE_ANNOTATION_SET ret.setAllowableContainerFilterTypes(ContainerFilter.Type.CurrentPlusProjectAndShared);