diff options
-rw-r--r-- | Bugzilla/Error.pm | 4 | ||||
-rw-r--r-- | Bugzilla/WebService/Server/JSONRPC.pm | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm index cf3688292..ad195f02f 100644 --- a/Bugzilla/Error.pm +++ b/Bugzilla/Error.pm @@ -124,9 +124,9 @@ sub _throw_error { message => $message, id => $server->{_bz_request_id}, version => $server->version); - # if _bz_request_id is set, we're inside the _handle() function + # if _bz_will_handle_error is set, we're inside the _handle() function # and we don't need to call $server->response. - unless ($server->{_bz_request_id}) { + unless ($server->{_bz_will_handle_error}) { $server->response($server->error_response_header); } } diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm index 093167048..38c8da296 100644 --- a/Bugzilla/WebService/Server/JSONRPC.pm +++ b/Bugzilla/WebService/Server/JSONRPC.pm @@ -271,6 +271,7 @@ sub _handle { my $self = shift; my ($obj) = @_; $self->{_bz_request_id} = $obj->{id}; + local $self->{_bz_will_handle_error} = 1; my $result = $self->SUPER::_handle(@_); |