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=eb3c6cb4ab85b21fc77ec1c49453be43baf81634;hp=4e3348a33c8cee6e93773f91c3e09d126ef59c83;hb=676438a11cbf6bd49102369824c9d87f70964fd3;hpb=84b04178bd25e342d7f522e8f60c6d695b09576a

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 4e3348a..eb3c6cb 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -1,7 +1,8 @@
 package Object::Remote::Connection;
 
-use CPS::Future;
+use Object::Remote::Future;
 use Object::Remote::Null;
+use Object::Remote::Handle;
 use Object::Remote;
 use IO::Handle;
 use Module::Runtime qw(use_module);
@@ -56,7 +57,7 @@ sub _build__json {
       return bless({}, 'Object::Remote::Null') if $id eq 'NULL';
       (
         $remotes->{$id}
-        or Object::Remote->new(connection => $self, id => $id)
+        or Object::Remote::Handle->new(connection => $self, id => $id)
       )->proxy;
     }
   );
@@ -156,7 +157,7 @@ sub _receive_data_from {
       $self->_receive($1);
     }
   } else {
-    $self->on_close->();
+    $self->on_close->done();
   }
 }
 
@@ -201,6 +202,13 @@ 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(@_) });
+    return unless $f;
+    $f->on_fail(sub { undef($f); $future->fail(@_) });
+    return;
+  }
   my $do = sub { $local->$method(@args) };
   eval {
     $future->done(