Skip to content

Commit 618dd60

Browse files
committed
Fix NPE
1 parent 71ceb1b commit 618dd60

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

jbrowse/src/org/labkey/jbrowse/model/JsonFile.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,14 @@ public File prepareResource(User u, Logger log, boolean throwIfNotPrepared, bool
828828
throw new PipelineJobException("No ExpData for JsonFile: " + getObjectId());
829829
}
830830

831-
final File processedTrackFile = getLocationOfProcessedTrack(true);
832-
final File processedTrackDir = processedTrackFile.getParentFile();
831+
File processedTrackFile = getLocationOfProcessedTrack(true);
832+
final File processedTrackDir = processedTrackFile == null ? null : processedTrackFile.getParentFile();
833+
if (processedTrackFile == null)
834+
{
835+
processedTrackFile = expData.getFile();
836+
log.debug("Track does not require processing or indexing, using original location: " + processedTrackFile.getPath());
837+
}
838+
833839
File targetFile = expData.getFile();
834840
if (needsGzip() && !isGzipped())
835841
{
@@ -898,6 +904,11 @@ public File prepareResource(User u, Logger log, boolean throwIfNotPrepared, bool
898904

899905
if (doIndex())
900906
{
907+
if (processedTrackDir == null)
908+
{
909+
throw new PipelineJobException("processedTrackDir should not be null");
910+
}
911+
901912
File trixDir = FileUtil.appendName(processedTrackDir, "trix");
902913
if (forceReprocess && trixDir.exists())
903914
{

0 commit comments

Comments
 (0)