From de24771a8ea84a7ffe2b47cba8a613d432830604 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Sat, 11 Jan 2020 17:01:44 -0800 Subject: [PATCH 1/2] Handle case where jobset has no defined errormsg for api/jobsets --- src/lib/Hydra/Controller/API.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Hydra/Controller/API.pm b/src/lib/Hydra/Controller/API.pm index 8bb710e0..18f60eb2 100644 --- a/src/lib/Hydra/Controller/API.pm +++ b/src/lib/Hydra/Controller/API.pm @@ -88,7 +88,7 @@ sub jobsetToHash { triggertime => $jobset->triggertime, fetcherrormsg => $jobset->fetcherrormsg, errortime => $jobset->errortime, - haserrormsg => $jobset->errormsg eq "" ? JSON::false : JSON::true + haserrormsg => defined($jobset->errormsg) ? ($jobset->errormsg eq "" ? JSON::false : JSON::true) : JSON::false }; } From cdd9d6e071f2499b81f567a6376feba10b95e39c Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Mon, 20 Jan 2020 10:40:33 -0800 Subject: [PATCH 2/2] Update haserrormsg logic implementation. --- src/lib/Hydra/Controller/API.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Hydra/Controller/API.pm b/src/lib/Hydra/Controller/API.pm index 18f60eb2..a084a3a8 100644 --- a/src/lib/Hydra/Controller/API.pm +++ b/src/lib/Hydra/Controller/API.pm @@ -88,7 +88,7 @@ sub jobsetToHash { triggertime => $jobset->triggertime, fetcherrormsg => $jobset->fetcherrormsg, errortime => $jobset->errortime, - haserrormsg => defined($jobset->errormsg) ? ($jobset->errormsg eq "" ? JSON::false : JSON::true) : JSON::false + haserrormsg => defined($jobset->errormsg) && $jobset->errormsg ne "" ? JSON::true : JSON::false }; }