Bug 554714: Make JSON-RPC throw errors properly even if they are thrown

before method evaluation (like during checking of Bugzilla_login and Bugzilla_password) r=dkl, a=mkanat

Bug 554714: Make JSON-RPC throw errors properly even if they are thrown
11e17bef · Max Kanat-Alexander · c2369536 · 11e17bef
Commit 11e17bef authored Mar 31, 2010 by Max Kanat-Alexander
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Error.pm Bugzilla/Error.pm +5 -2

No files found.
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -127,9 +127,12 @@ sub _throw_error {
                                     message => $message,
                                     id      => $server->{_bz_request_id},
                                     version => $server->version);
-                # We die with no message. JSON::RPC checks raise_error before
+                # 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;
+                die if _in_eval();
+                $server->response($server->error_response_header);
            }
        }
    }