From 89edcdc73272e7af80edda82374f27b7d9fb3203 Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Wed, 1 May 2019 09:03:37 -0700 Subject: [PATCH 1/2] Prevent NPEs in mascot client due to undefined server URL (#19) --- ms2/src/org/labkey/ms2/pipeline/mascot/MascotClientImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms2/src/org/labkey/ms2/pipeline/mascot/MascotClientImpl.java b/ms2/src/org/labkey/ms2/pipeline/mascot/MascotClientImpl.java index 6266fda745..12266a8e24 100644 --- a/ms2/src/org/labkey/ms2/pipeline/mascot/MascotClientImpl.java +++ b/ms2/src/org/labkey/ms2/pipeline/mascot/MascotClientImpl.java @@ -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; From 7b964d61c2d8293a57dc351d518a4602d45e53d9 Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Wed, 1 May 2019 09:04:06 -0700 Subject: [PATCH 2/2] Make NAb actions 404 when a non-NAb runId is specified (#18) --- nab/src/org/labkey/nab/NabAssayController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nab/src/org/labkey/nab/NabAssayController.java b/nab/src/org/labkey/nab/NabAssayController.java index 3dc834a349..e380e01072 100644 --- a/nab/src/org/labkey/nab/NabAssayController.java +++ b/nab/src/org/labkey/nab/NabAssayController.java @@ -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; }