Skip to content

Commit 9adb58f

Browse files
committed
Avoid NPE
1 parent 816e8ab commit 9adb58f

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/analysis/CellHashingHandler.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,18 +264,26 @@ public void processFilesRemote(List<Readset> readsets, JobContext ctx) throws Un
264264
Map<String, Object> callMap = executeCiteSeqCount(ctx, action, rs, editDistance, minCountPerCell, _generateHtoCalls);
265265
results.put(editDistance, callMap);
266266

267-
int singlet = Integer.parseInt(callMap.get("singlet").toString());
268-
ctx.getLogger().info("Edit distance: " + editDistance + ", singlet: " + singlet + ", doublet: " + callMap.get("doublet"));
269-
if (singlet > highestSinglet)
267+
if (_generateHtoCalls)
270268
{
271-
highestSinglet = singlet;
272-
bestEditDistance = editDistance;
269+
int singlet = Integer.parseInt(callMap.get("singlet").toString());
270+
ctx.getLogger().info("Edit distance: " + editDistance + ", singlet: " + singlet + ", doublet: " + callMap.get("doublet"));
271+
if (singlet > highestSinglet)
272+
{
273+
highestSinglet = singlet;
274+
bestEditDistance = editDistance;
275+
}
273276
}
274277
}
275278

279+
if (editDistances.size() == 0)
280+
{
281+
bestEditDistance = editDistances.iterator().next();
282+
}
283+
276284
if (bestEditDistance != null)
277285
{
278-
ctx.getLogger().info("Using edit distance: " + bestEditDistance + ", singlet: " + highestSinglet);
286+
ctx.getLogger().info("Using edit distance: " + bestEditDistance + (_generateHtoCalls ? ", singlet: " + highestSinglet : ""));
279287

280288
Map<String, Object> callMap = results.get(bestEditDistance);
281289
if (_generateHtoCalls)

0 commit comments

Comments
 (0)