X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXUser.pm;h=c611fac376ca54605fa6967dd6e43d87d68dc787;hb=fa7bdf4c84e162d43cb6ba5b43f89cc230ebcc30;hp=94fa3d1a9ff1549fe2659b69444fef2915c565a9;hpb=963ead7224e53e257c7c661683174a75c2935cda;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 94fa3d1a..c611fac3 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -247,14 +247,15 @@ sub get
 	
 	# search for it
 	unless ($dbm->get($call, $data)) {
-		$ref = decode($data);
+		$ref = eval{decode($data)};
 		if ($ref) {
-			if (ref $ref ne 'DXUser') {
-				dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+			if (!UNIVERSAL::isa($ref, 'DXUser')) {
+				dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
 				return undef;
 			}
+			# we have a reference and it *is* a DXUser
 		} else {
-			dbg("DXUser::get: no reference returned from decode $!");
+			dbg("DXUser::get: no reference returned from decode of $call $! $@");
 			return undef;
 		}
 		$lru->put($call, $ref);
@@ -278,9 +279,9 @@ sub get_current
 	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		my $ref = $dxchan->user;
-		return $ref if ref $ref eq 'DXUser';
+		return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
 
-		dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+		dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
 	}
 	return get($call);
 }