X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFuture.pm;fp=lib%2FObject%2FRemote%2FFuture.pm;h=83aad963a4f4eab9b24cc5273c86170a213ffd14;hb=d002a2eac8f0900b6c5f1387ca4a5ecd8cd8cf42;hp=d8acd3c7c989efb0dfe51f2b54ed1124acf5c5af;hpb=e42ea8c86203339ab8290ec9f6647778f0bdec1c;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Future.pm b/lib/Object/Remote/Future.pm
index d8acd3c..83aad96 100644
--- a/lib/Object/Remote/Future.pm
+++ b/lib/Object/Remote/Future.pm
@@ -99,17 +99,10 @@ sub AUTOLOAD {
   my $invocant = shift;
   my ($method) = our $AUTOLOAD =~ /^then::(.+)$/;
   my @args = @_;
-  # Need two copies since if we're called on an already complete future
-  # $f will be freed immediately
-  my $ret = my $f = Future->new;
-  $invocant->on_fail(sub { $f->fail(@_); undef($f); });
-  $invocant->on_done(sub {
-    my ($obj) = @_;
-    my $next = $obj->${\"start::${method}"}(@args);
-    $next->on_done(sub { $f->done(@_); undef($f); });
-    $next->on_fail(sub { $f->fail(@_); undef($f); });
+  return $invocant->and_then(sub {
+    my ($obj) = $_[0]->get;
+    return $obj->${\"start::${method}"}(@args);
   });
-  return $ret;
 }
 
 1;