Skip to content

Merge from develop #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 2 commits into from
May 6, 2019
Merged

Merge from develop #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89edcdc
Prevent NPEs in mascot client due to undefined server URL (#19)
labkey-tchad May 1, 2019
7b964d6
Make NAb actions 404 when a non-NAb runId is specified (#18)
labkey-tchad May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ms2/src/org/labkey/ms2/pipeline/mascot/MascotClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public MascotClientImpl(String url, Logger instanceLogger)

public MascotClientImpl(String url, Logger instanceLogger, String userAccount, String userPassword)
{
_url = url;
_url = (null == url) ? "" : url;
_instanceLogger = (null == instanceLogger) ? _log : instanceLogger;
_userAccount = (null == userAccount) ? "" : userAccount;
_userPassword = (null == userPassword) ? "" : userPassword;
Expand Down
2 changes: 1 addition & 1 deletion nab/src/org/labkey/nab/NabAssayController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ protected DilutionAssayProvider getProvider(ExpRun run)
{
AssayProvider provider = AssayService.get().getProvider(run.getProtocol());
if (!(provider instanceof DilutionAssayProvider))
throw new IllegalArgumentException("Run " + run.getRowId() + " is not a NAb run.");
throw new NotFoundException("Run " + run.getRowId() + " is not a NAb run.");
return (DilutionAssayProvider) provider;
}

Expand Down