From cbf31360269d80227be82a8a0ca2f38cfc35d9d0 Mon Sep 17 00:00:00 2001 From: "bzrmirror%bugzilla.org" Date: Fri, 23 Jan 2015 17:45:45 +0000 Subject: [PATCH] Bug 1124716: regression caused by bug 1090275 to whitelist webservice methods causes test failures with t/012throwables.t r=dylan,a=glob git-svn-id: svn://10.0.0.236/branches/BUGZILLA-4_0-BRANCH@265795 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/.gitrev | 2 +- mozilla/webtools/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 91b4b42ffcf..19c0ab58817 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -7805 \ No newline at end of file +7806 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index 2590ecd97b2..da71416effe 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -c4dbb67945543139570a1859812cd0642aed47d5 \ No newline at end of file +2ba08235aae379dd32d821de4007cb3bcb37d48b \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm index 1f1840d4b20..6586a9bb8df 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm @@ -390,7 +390,7 @@ sub _argument_type_check { # Only allowed methods to be used from our whitelist if (none { $_ eq $method} $pkg->PUBLIC_METHODS) { - ThrowUserError('unknown_method', { method => $self->bz_method_name }); + ThrowCodeError('unknown_method', { method => $self->_bz_method_name }); } # This is the best time to do login checks.