X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=3b66cd5f612f0d8e88649031954ed7f2fb95c99e;hp=4e3348a33c8cee6e93773f91c3e09d126ef59c83;hb=dc28afe80b27f0eb81eef66e6ba554a7c1fb6e41;hpb=84b04178bd25e342d7f522e8f60c6d695b09576a

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 4e3348a..3b66cd5 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -1,6 +1,6 @@
 package Object::Remote::Connection;
 
-use CPS::Future;
+use Object::Remote::Future;
 use Object::Remote::Null;
 use Object::Remote;
 use IO::Handle;
@@ -156,7 +156,7 @@ sub _receive_data_from {
       $self->_receive($1);
     }
   } else {
-    $self->on_close->();
+    $self->on_close->done();
   }
 }
 
@@ -201,6 +201,12 @@ sub receive_class_call {
 
 sub _invoke {
   my ($self, $future, $local, $ctx, $method, @args) = @_;
+  if ($method =~ /^start::/) {
+    my $f = $local->$method(@args);
+    $f->on_done(sub { undef($f); $future->done(@_) });
+    $f->on_fail(sub { undef($f); $future->fail(@_) });
+    return;
+  }
   my $do = sub { $local->$method(@args) };
   eval {
     $future->done(