X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;fp=perl%2FDXUser.pm;h=84b6df3dd721ee99704c0a8867ece5c09dd8235a;hb=6951e5c6623c813b5f3da77796aa22c7e0848e44;hp=c273970bf542df3a8c0589124486239e537eee05;hpb=ec1b2a19fcc6539f071a766671b5fa5be8694362;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index c273970b..84b6df3d 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -373,27 +373,25 @@ sub get
 	# search for it
 	if ($v4) {
 		if ($data = _select($call)) {
-			$ref = bless decode_json($data), __PACKAGE__;
-			$lru->put($call, $ref);
-			return $ref;
+			$ref = bless decode_json($data), 'DXUser';
 		}
 	} else {
 	    unless ($dbm->get($call, $data)) {
 			$ref = decode($data);
-			if ($ref) {
-				if (ref $ref ne 'DXUser') {
-					dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
-					return undef;
-				}
-			} else {
-				dbg("DXUser::get: no reference returned from decode $!");
-				return undef;
-			}
-			$lru->put($call, $ref);
-			return $ref;
 		}
 	}
 	
+	if ($ref) {
+		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 of $call $!");
+		return undef;
+	}
+	$lru->put($call, $ref);
 	return undef;
 }
 
@@ -412,9 +410,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);
 }