From 17a002aa2e375d83abe9579aea19fb7a4ba10815 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Sun, 23 Mar 2025 18:58:34 -0700 Subject: [PATCH 1/2] CODEOWNERS (#918) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 623678e23..b45098d31 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -@labkey-martyp \ No newline at end of file +* @labkey-martyp \ No newline at end of file From 7dcb2f37992ed1ef11dd967276b4c04acb271b83 Mon Sep 17 00:00:00 2001 From: Jay Allen <107942890+jallentxbiomed@users.noreply.github.com> Date: Wed, 26 Mar 2025 19:27:43 -0500 Subject: [PATCH 2/2] added check for null eventData subpackages (#925) --- snd/src/org/labkey/snd/SNDManager.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/snd/src/org/labkey/snd/SNDManager.java b/snd/src/org/labkey/snd/SNDManager.java index 4ad8e57b7..d04bd0cc8 100644 --- a/snd/src/org/labkey/snd/SNDManager.java +++ b/snd/src/org/labkey/snd/SNDManager.java @@ -2744,12 +2744,14 @@ private void ensureValidPackage(Event event, EventData eventData, Package pkg) for (SuperPackage superPackage : pkg.getSubpackages()) { found = false; - for (EventData data : eventData.getSubPackages()) - { - if (data.getSuperPkgId() == superPackage.getSuperPkgId()) + if (eventData.getSubPackages() != null) { + for (EventData data : eventData.getSubPackages()) { - found = true; - ensureValidPackage(event, data, superPackage.getPkg()); + if (data.getSuperPkgId() == superPackage.getSuperPkgId()) + { + found = true; + ensureValidPackage(event, data, superPackage.getPkg()); + } } }