Fix NPE

bbimber · bbimber · commit 19e211ec204f · 2026-02-01T15:57:07.000-08:00
diff --git a/jbrowse/src/org/labkey/jbrowse/model/JsonFile.java b/jbrowse/src/org/labkey/jbrowse/model/JsonFile.java
@@ -179,8 +179,13 @@ public void setSequenceId(Integer sequenceId)
 
     public File getBaseDir()
     {
-        File jbrowseDir = FileUtil.appendName(JBrowseManager.get().getBaseDir(getContainerObj(), needsProcessing()), "resources");
+        File baseDir  = JBrowseManager.get().getBaseDir(getContainerObj(), needsProcessing());
+        if (baseDir == null)
+        {
+            return null;
+        }
 
+        File jbrowseDir = FileUtil.appendName(baseDir, "resources");
         return needsProcessing() ? FileUtil.appendName(jbrowseDir, getObjectId()) : null;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,13 @@ public void setSequenceId(Integer sequenceId)`
`179`	`179`
`180`	`180`	`public File getBaseDir()`
`181`	`181`	`{`
`182`		`- File jbrowseDir = FileUtil.appendName(JBrowseManager.get().getBaseDir(getContainerObj(), needsProcessing()), "resources");`
	`182`	`+ File baseDir = JBrowseManager.get().getBaseDir(getContainerObj(), needsProcessing());`
	`183`	`+ if (baseDir == null)`
	`184`	`+ {`
	`185`	`+ return null;`
	`186`	`+ }`
`183`	`187`
	`188`	`+ File jbrowseDir = FileUtil.appendName(baseDir, "resources");`
`184`	`189`	`return needsProcessing() ? FileUtil.appendName(jbrowseDir, getObjectId()) : null;`
`185`	`190`	`}`
`186`	`191`