diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-06-21 23:00:55 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-06-28 22:42:01 +0200 |
| commit | d56c99a3286afb63266d5019069d15ab4b647106 (patch) | |
| tree | 861fbe3dca2034e04c07dfd7299b2db72b049edc /Bugzilla | |
| parent | 029849c64ff3d8207a7266f341cd4a8acbf88f8d (diff) | |
| download | bugzilla-d56c99a3286afb63266d5019069d15ab4b647106.tar.gz bugzilla-d56c99a3286afb63266d5019069d15ab4b647106.tar.xz | |
try to fix webservice test again
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Error.pm | 5 | ||||
| -rw-r--r-- | Bugzilla/Quantum/CGI.pm | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index 9fcd16386..dcb79cfb2 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -124,11 +124,6 @@ sub _throw_error { message => $message, id => $server->{_bz_request_id}, version => $server->version); - # Most JSON-RPC Throw*Error calls happen within an eval inside - # of JSON::RPC. So, in that circumstance, instead of exiting, - # we die with no message. JSON::RPC checks raise_error before - # it checks $@, so it returns the proper error. - die if _in_eval(); $server->response($server->error_response_header); } } diff --git a/Bugzilla/Quantum/CGI.pm b/Bugzilla/Quantum/CGI.pm index de4e59bb5..c36ed9654 100644 --- a/Bugzilla/Quantum/CGI.pm +++ b/Bugzilla/Quantum/CGI.pm @@ -65,7 +65,7 @@ sub load_one { $inner->(); } catch { - die $_ unless ref $_ eq 'ARRAY' && $_->[0] eq "EXIT\n" || /^Died at.*Error\.pm/ + die $_ unless ref $_ eq 'ARRAY' && $_->[0] eq "EXIT\n"; } finally { untie *STDOUT; |