[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

[raeburn]

raeburn		Tue Jul 29 05:49:33 2014 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Reverse changes in 1.1179 and 1.1206 to permit early out from symbread()
    in more cases.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1264 loncom/lonnet/perl/lonnet.pm:1.1265
--- loncom/lonnet/perl/lonnet.pm:1.1264	Thu Jul  3 14:11:43 2014
+++ loncom/lonnet/perl/lonnet.pm	Tue Jul 29 05:49:32 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1264 2014/07/03 14:11:43 raeburn Exp $
+# $Id: lonnet.pm,v 1.1265 2014/07/29 05:49:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -10856,14 +10856,10 @@
 
 sub symbread {
     my ($thisfn,$donotrecurse)=@_;
-    my $cache_str;
-    if ($thisfn ne '') {
-        $cache_str='request.symbread.cached.'.$thisfn;
-        if ($env{$cache_str} ne '') {
-            return $env{$cache_str};
-        }
-    } else {
+    my $cache_str='request.symbread.cached.'.$thisfn;
+    if (defined($env{$cache_str})) { return $env{$cache_str}; }
 # no filename provided? try from environment
+    unless ($thisfn) {
         if ($env{'request.symb'}) {
 	    return $env{$cache_str}=&symbclean($env{'request.symb'});
 	}