Skip to content

Commit d6630a7

Browse files
committed
Bugfix GenotypeGVCFs params
1 parent d688553 commit d6630a7

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ private File runGenotypeGVCFs(PipelineJob job, JobContext ctx, ProcessVariantsHa
356356
toolParams.add(f.getPath());
357357
}
358358

359-
if (ctx.getParams().get("variantCalling.GenotypeGVCFs.allowOldRmsMappingData") != null)
359+
if (ctx.getParams().optBoolean("variantCalling.GenotypeGVCFs.allowOldRmsMappingData", false))
360360
{
361361
toolParams.add("--allow-old-rms-mapping-quality-annotation-data");
362362
}

omerointegration/src/org/labkey/omerointegration/OmeroServer.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,13 @@ private String getProperty(String name)
134134
private ExperimenterData connect(Gateway gateway, URL url) throws Exception
135135
{
136136
LoginCredentials cred = new LoginCredentials();
137-
cred.getServer().setHostname(url.getHost());
137+
cred.getServer().setHost(url.getHost());
138138
if (url.getPort() > 0) {
139139
cred.getServer().setPort(url.getPort());
140140
}
141141
cred.getUser().setUsername(getOmeroUser());
142142
cred.getUser().setPassword(getOmeroPassword());
143-
ExperimenterData user = gateway.connect(cred);
144-
145-
return user;
143+
return gateway.connect(cred);
146144
}
147145

148146
public void getThumbnail(String omeroId, HttpServletResponse response)

0 commit comments

Comments
 (0)