X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FHandle.pm;h=782ddf678819721ac07f89b90e2167719f84bbd6;hp=7e9c21870d976037e7fbe02799ea344dc1851d9c;hb=bef36e73e4257b2ba8e59eb55661ffc51d8a620a;hpb=5add5e29851e82862e4d8f6d67dfce559f6685ce

diff --git a/lib/Object/Remote/Handle.pm b/lib/Object/Remote/Handle.pm
index 7e9c218..782ddf6 100644
--- a/lib/Object/Remote/Handle.pm
+++ b/lib/Object/Remote/Handle.pm
@@ -4,10 +4,6 @@ use Object::Remote::Proxy;
 use Scalar::Util qw(weaken blessed);
 use Object::Remote::Logging qw ( :log :dlog router );
 use Object::Remote::Future;
-#must find way to exclude certain log events
-#from being forwarded - log events generated in
-#response to log events cause exploding
-#use Object::Remote::Logging qw(:log);
 use Module::Runtime qw(use_module);
 use Moo;
 
@@ -59,12 +55,12 @@ sub call {
   my ($self, $method, @args) = @_;
   my $w = wantarray;
   my $id = $self->id;
-  
+
   $method = "start::${method}" if (caller(0)||'') eq 'start';
   log_trace { "call('$method') has been invoked on remote handle '$id'; creating future" };
 
   future {
-    log_debug { "Invoking send on connection for handle '$id' method $method" };
+    log_debug { "Invoking send on connection for handle '$id' method '$method'" };
     $self->connection->send(call => $id, $w, $method, @args)
   };
 }
@@ -86,7 +82,11 @@ sub DEMOLISH {
   my ($self, $gd) = @_;
   Dlog_trace { "Demolishing remote handle $_" } $self->id;
   return if $gd or $self->disarmed_free;
-  $self->connection->send_free($self->id);
+  #this could happen after the connection has gone away
+  eval { $self->connection->send_free($self->id) };
+  if ($@ && $@ !~ m/^Attempt to invoke _send on a connection that is not valid/) {
+    die "Could not invoke send_free on connection for handle " . $self->id;
+  }
 }
 
 1;