Fix hashing validation

bbimber · bbimber · commit bd7a3666933b · 2021-04-09T07:05:16.000-07:00
diff --git a/singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java b/singlecell/src/org/labkey/singlecell/CellHashingServiceImpl.java
@@ -333,12 +333,16 @@ else if (distinctHTOs.size() == 1)
                 }
             }
 
-            if (uniqueHashtagGroups.isEmpty())
+            if (!distinctHTOs.isEmpty() && uniqueHashtagGroups.isEmpty())
             {
+
                 throw new PipelineJobException("No hashing groups found!");
             }
 
-            writeAllHashingBarcodes(uniqueHashtagGroups, job.getUser(), job.getContainer(), sourceDir);
+            if (!uniqueHashtagGroups.isEmpty())
+            {
+                writeAllHashingBarcodes(uniqueHashtagGroups, job.getUser(), job.getContainer(), sourceDir);
+            }
         }
         catch (IOException e)
         {

Original file line number	Diff line number	Diff line change
`@@ -333,12 +333,16 @@ else if (distinctHTOs.size() == 1)`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`336`		`- if (uniqueHashtagGroups.isEmpty())`
	`336`	`+ if (!distinctHTOs.isEmpty() && uniqueHashtagGroups.isEmpty())`
`337`	`337`	`{`
	`338`	`+`
`338`	`339`	`throw new PipelineJobException("No hashing groups found!");`
`339`	`340`	`}`
`340`	`341`
`341`		`- writeAllHashingBarcodes(uniqueHashtagGroups, job.getUser(), job.getContainer(), sourceDir);`
	`342`	`+ if (!uniqueHashtagGroups.isEmpty())`
	`343`	`+ {`
	`344`	`+ writeAllHashingBarcodes(uniqueHashtagGroups, job.getUser(), job.getContainer(), sourceDir);`
	`345`	`+ }`
`342`	`346`	`}`
`343`	`347`	`catch (IOException e)`
`344`	`348`	`{`