catch exceptions in callbacks and act accordingly

stevan · Oct 22, 2013 · d78f2f4 · d78f2f4
1 parent bf7382a
commit d78f2f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Promises
 
+0.05
+    - catch exceptions in any callback and
+      call reject if they happen
+
 0.04 Thursday, Oct. 17, 2013
     *** DEPRECATION WARNING ***
     - The 'when' helper in Promises.pm is being

diff --git a/lib/Promises/Deferred.pm b/lib/Promises/Deferred.pm
@@ -99,8 +99,11 @@ sub then {
 sub _wrap {
     my ($self, $d, $f, $method) = @_;
     return sub {
-        my @results = $f->( @_ );
-        if ( (scalar @results) == 1 && blessed $results[0] && $results[0]->isa('Promises::Promise') ) {
+        local $@;
+        my @results = do { $f->( @_ ) };
+        if ($@) {
+            $d->reject( $@ );
+        } elsif ( (scalar @results) == 1 && blessed $results[0] && $results[0]->isa('Promises::Promise') ) {
             $results[0]->then(
                 sub { $d->resolve( @{ $results[0]->result } ) },
                 sub { $d->reject( @{ $results[0]->result } )  },