From e8a45b2fae3ced3c03ea527f348d13ad9e3b7201 Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 13 Jan 2026 15:39:54 -0800 Subject: [PATCH 1/2] Fix filter for deleting data/material input --- .../org/labkey/experiment/api/ExpProtocolApplicationImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/experiment/src/org/labkey/experiment/api/ExpProtocolApplicationImpl.java b/experiment/src/org/labkey/experiment/api/ExpProtocolApplicationImpl.java index 56c1203b45f..9b2a3693d88 100644 --- a/experiment/src/org/labkey/experiment/api/ExpProtocolApplicationImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExpProtocolApplicationImpl.java @@ -397,7 +397,7 @@ private long deleteDataInputs() OntologyManager.deleteOntologyObjects(svc.getSchema(), new SQLFragment("SELECT " + dialect.concatenate("'" + DataInput.lsidPrefix() + "'", "CAST(dataId AS VARCHAR)", "'.'", "CAST(targetApplicationId AS VARCHAR)") + - " FROM " + svc.getTinfoDataInput() + " WHERE TargetApplicationId IN (SELECT RowId FROM exp.ProtocolApplication WHERE RunId = " + getRowId() + ")"), getContainer()); + " FROM " + svc.getTinfoDataInput() + " WHERE TargetApplicationId = ?", getRowId()), getContainer()); return Table.delete(ExperimentServiceImpl.get().getTinfoDataInput(), new SimpleFilter(FieldKey.fromParts("TargetApplicationId"), getRowId())); } @@ -413,7 +413,7 @@ private long deleteMaterialInputs() OntologyManager.deleteOntologyObjects(svc.getSchema(), new SQLFragment("SELECT " + dialect.concatenate("'" + MaterialInput.lsidPrefix() + "'", "CAST(materialId AS VARCHAR)", "'.'", "CAST(targetApplicationId AS VARCHAR)") + - " FROM " + svc.getTinfoMaterialInput() + " WHERE TargetApplicationId IN (SELECT RowId FROM exp.ProtocolApplication WHERE RunId = " + getRowId() + ")"), getContainer()); + " FROM " + svc.getTinfoMaterialInput() + " WHERE TargetApplicationId = ?", getRowId()), getContainer()); return Table.delete(ExperimentServiceImpl.get().getTinfoMaterialInput(), new SimpleFilter(FieldKey.fromParts("TargetApplicationId"), getRowId())); } From aa78c8f89e9dabb08227f90aa683f63642f4d22f Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Wed, 14 Jan 2026 10:29:37 -0800 Subject: [PATCH 2/2] ExpLineage: avoid putting null values on stack --- api/src/org/labkey/api/exp/api/ExpLineage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/org/labkey/api/exp/api/ExpLineage.java b/api/src/org/labkey/api/exp/api/ExpLineage.java index c7087021ff7..772bd46f1f8 100644 --- a/api/src/org/labkey/api/exp/api/ExpLineage.java +++ b/api/src/org/labkey/api/exp/api/ExpLineage.java @@ -384,7 +384,7 @@ else if ((clazz == ExpMaterial.class && target instanceof ExpMaterial) || } else // ExpMaterial or generic Identifiable { - if (!seen.contains(target)) + if (!seen.contains(target) && target != null) { stack.add(target); seen.add(target);