Null check

bbimber · bbimber · commit b2e8037aa39b · 2025-06-13T07:36:32.000-07:00
diff --git a/SivStudies/src/org/labkey/sivstudies/etl/SubjectScopedSelect.java b/SivStudies/src/org/labkey/sivstudies/etl/SubjectScopedSelect.java
@@ -453,10 +453,10 @@ private List<String> getSubjects(Logger log)
         }
         else
         {
-            Container source = ContainerManager.getForPath(_settings.get(Settings.subjectSourceContainerPath.name()));
+            Container source = _settings.get(Settings.subjectSourceContainerPath.name()) == null ? _containerUser.getContainer() : ContainerManager.getForPath(_settings.get(Settings.subjectSourceContainerPath.name()));
             if (source == null)
             {
-                source = _containerUser.getContainer();
+                throw new IllegalStateException("Unknown subjectSourceContainerPath: " + _settings.get(Settings.subjectSourceContainerPath.name()));
             }
 
             if (!source.hasPermission(_containerUser.getUser(), ReadPermission.class))

Original file line number	Diff line number	Diff line change
`@@ -453,10 +453,10 @@ private List<String> getSubjects(Logger log)`
`453`	`453`	`}`
`454`	`454`	`else`
`455`	`455`	`{`
`456`		`- Container source = ContainerManager.getForPath(_settings.get(Settings.subjectSourceContainerPath.name()));`
	`456`	`+ Container source = _settings.get(Settings.subjectSourceContainerPath.name()) == null ? _containerUser.getContainer() : ContainerManager.getForPath(_settings.get(Settings.subjectSourceContainerPath.name()));`
`457`	`457`	`if (source == null)`
`458`	`458`	`{`
`459`		`- source = _containerUser.getContainer();`
	`459`	`+ throw new IllegalStateException("Unknown subjectSourceContainerPath: " + _settings.get(Settings.subjectSourceContainerPath.name()));`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`if (!source.hasPermission(_containerUser.getUser(), ReadPermission.class))`