--- loncom/lonnet/perl/lonnet.pm	2004/10/26 15:03:08	1.552
+++ loncom/lonnet/perl/lonnet.pm	2004/10/27 18:23:08	1.555
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.552 2004/10/26 15:03:08 albertel Exp $
+# $Id: lonnet.pm,v 1.555 2004/10/27 18:23:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -461,7 +461,7 @@ sub overloaderror {
     if ($overload>0) {
 	$r->err_headers_out->{'Retry-After'}=$overload;
         $r->log_error('Overload of '.$overload.' on '.$checkserver);
-        return 409;
+        return 413;
     }    
     return '';
 }
@@ -1873,6 +1873,7 @@ sub devalidate {
         # - the student level sheet of this user in course's homespace
         # - the assessment level sheet for this resource 
         #   for this user in user's homespace
+	# - current conditional state info
 	my $key=$uname.':'.$udom.':';
         my $status=
 	    &del('nohist_calculatedsheets',
@@ -1887,6 +1888,7 @@ sub devalidate {
                     $uname.' at '.$udom.' for '.
 		    $symb.': '.$status);
         }
+	&delenv('user.state.'.$cid);
     }
 }
 
@@ -3871,6 +3873,9 @@ sub GetFileTimestamp {
 
 sub directcondval {
     my $number=shift;
+    if (!defined($ENV{'user.state.'.$ENV{'request.course.id'}})) {
+	&Apache::lonuserstate::evalstate();
+    }
     if ($ENV{'user.state.'.$ENV{'request.course.id'}}) {
        return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1);
     } else {