From d59027c40ed73fa9e114706d0c5a885785311dec Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin
Date: Wed, 31 Jul 2013 10:09:23 +0100
Subject: fix($q): call `reject()` even if `$exceptionHandler` rethrows

Normally $exceptionHandler doesn't throw an exception.  It is normally
used just for logging and so on.  But if an application developer
implemented a version that did throw an exception then $q would never
have called reject() when converting an exception thrown inside a `then`
handler into a rejected promise.
---
 src/ng/q.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ng/q.js b/src/ng/q.js
index 2b75b3c8..bf235640 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -215,8 +215,8 @@ function qFactory(nextTick, exceptionHandler) {
             try {
               result.resolve((callback || defaultCallback)(value));
             } catch(e) {
-              exceptionHandler(e);
               result.reject(e);
+              exceptionHandler(e);
             }
           };
 
@@ -224,8 +224,8 @@ function qFactory(nextTick, exceptionHandler) {
             try {
               result.resolve((errback || defaultErrback)(reason));
             } catch(e) {
-              exceptionHandler(e);
               result.reject(e);
+              exceptionHandler(e);
             }
           };
 
-- 
cgit v1.2.3