projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add CTY-2413 prefixes
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index 94fa3d1a9ff1549fe2659b69444fef2915c565a9..432507462e5048b51620d271e45307e19300f40c 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-191,7
+191,7
@@
sub del_file
sub process
{
if ($main::systime > $lasttime + 15) {
sub process
{
if ($main::systime > $lasttime + 15) {
- $dbm->sync;
+ $dbm->sync
if $dbm
;
$lasttime = $main::systime;
}
}
$lasttime = $main::systime;
}
}
@@
-249,12
+249,13
@@
sub get
unless ($dbm->get($call, $data)) {
$ref = decode($data);
if ($ref) {
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");
+ if (
!UNIVERSAL::isa($ref, 'DXUser')
) {
+ dbg("DXUser::get: got strange answer from decode
of $call
". ref $ref. " ignoring");
return undef;
}
return undef;
}
+ # we have a reference and it *is* a DXUser
} else {
} 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);
return undef;
}
$lru->put($call, $ref);
@@
-278,9
+279,9
@@
sub get_current
my $dxchan = DXChannel::get($call);
if ($dxchan) {
my $ref = $dxchan->user;
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 f
or $call f
rom dxchan $dxchan->{call} ". ref $ref. " ignoring");
}
return get($call);
}
}
return get($call);
}