add more error messages around DXUser::get*

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index e2c24f598a5eee6d7fdd941ade20ac7f46cb0c78..34870a953dc91311ae9b10bc216b28b2e88113a8 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -242,14 +242,18 @@ sub get
        
        # is it in the LRU cache?
        my $ref = $lru->get($call);
-       return $ref if $ref;
+       return $ref if $ref && ref $ref eq 'DXUser';
        
        # search for it
        unless ($dbm->get($call, $data)) {
                $ref = decode($data);
-               dbg("DXUser::get: data error on $call $!") unless $ref;
-               if ($ref && ref $ref ne 'DXUser') {
-                       dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+               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);
@@ -271,7 +275,12 @@ sub get_current
        my $call = uc shift;
   
        my $dxchan = DXChannel::get($call);
-       return $dxchan->user if $dxchan;
+       if ($dxchan) {
+               my $ref = $dxchan->user;
+               return $ref if ref $ref eq 'DXUser';
+
+               dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+       }
        return get($call);
 }
 

diff --git a/perl/Version.pm b/perl/Version.pm
index bb6d3449462ee211946e46c124eb9fbaa28c643a..b5ad051aa4eb611fa7268fce15657b61a3d0ae69 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.55';
 $subversion = '0';
-$build = '4';
+$build = '5';
 
 1;