Skip to content

Commit b3e27e5

Browse files
committed
Fix issues with JSONObject migration
1 parent d0f8a76 commit b3e27e5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
8383
RecordedAction action = new RecordedAction(getName());
8484
action.setStartTime(new Date());
8585

86-
Integer windowSize = params.has("windowSize") && params.get("windowSize") != null ? Integer.valueOf(params.getInt("windowSize")) : null;
86+
Integer windowSize = params.has("windowSize") && !params.isNull("windowSize") ? Integer.valueOf(params.getInt("windowSize")) : null;
8787
if (windowSize == null)
8888
{
8989
job.error("No window size provided, aborting");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public void processFilesRemote(List<SequenceOutputFile> inputFiles, JobContext c
232232
}
233233

234234
int minAlignmentLength = 0;
235-
if (params.get("minAlignmentLength") != null)
235+
if (!params.isNull("minAlignmentLength"))
236236
{
237237
minAlignmentLength = params.getInt("minAlignmentLength");
238238
}

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/SequenceJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public Map<String, String> getParameters()
257257

258258
for (String key : json.keySet())
259259
{
260-
ret.put(key, json.opt(key) == null ? null : String.valueOf(json.get(key)));
260+
ret.put(key, json.isNull(key) ? null : String.valueOf(json.get(key)));
261261
}
262262

263263
return ret;

0 commit comments

Comments
 (0)