--- parser3/src/classes/op.C	2005/11/22 15:11:05	1.152.4.5
+++ parser3/src/classes/op.C	2005/11/22 15:40:17	1.161
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_OP_C="$Date: 2005/11/22 15:11:05 $";
+static const char * const IDENT_OP_C="$Date: 2005/11/22 15:40:17 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -269,7 +269,9 @@ static void _for(Request& r, MethodParam
 
 	bool need_delim=false;
 	VInt* vint=new VInt(0);
-	r.get_method_frame()->caller()->put_element(var_name, vint, false);
+
+	VMethodFrame& caller=*r.get_method_frame()->caller();
+	caller.put_element(caller, var_name, vint, false);
 	for(int i=from; i<=to; i++) {
 		vint->set_int(i);
 
@@ -415,7 +417,7 @@ struct Try_catch_result {
 template<class I>
 static Try_catch_result try_catch(Request& r, 
 		  StringOrValue body_code(Request&, I), I info, 
-		  Value* catch_code) 
+		  Value* catch_code, bool could_be_handled_by_caller=false) 
 {
 	Try_catch_result result;
 	if(!catch_code) {
@@ -435,21 +437,25 @@ static Try_catch_result try_catch(Reques
 		Junction* junction=catch_code->get_junction();
 		Value* method_frame=junction->method_frame;
 		Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false);
-		junction->method_frame->put_element(exception_var_name, &details.vhash, false);
+		VMethodFrame& frame=*junction->method_frame;
+		frame.put_element(frame, exception_var_name, &details.vhash, false);
 		result.processed_code=r.process(*catch_code);
 		
 		// retriving $exception.handled, restoring $exception var
 		Value* vhandled=details.vhash.hash().get(exception_handled_part_name);
-		junction->method_frame->put_element(exception_var_name, saved_exception_var_value, false);
+		frame.put_element(frame, exception_var_name, saved_exception_var_value, false);
 
 		bool bhandled=false;
 		if(vhandled) {
 			if(vhandled->is_string()) { // not simple $exception.handled(1/0)?
-				result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover
-				return result;
-			}
-
-			bhandled=vhandled->as_bool();		
+				if(could_be_handled_by_caller) { // and we can possibly handle it
+					result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover
+					return result;
+				}
+				
+				bhandled=false;
+			} else
+				bhandled=vhandled->as_bool();		
 		}
 
 		if(!bhandled) {
@@ -496,7 +502,7 @@ struct Locked_process_and_cache_put_acti
 
 
 static StringOrValue process_cache_body_code(Request& r, Value* body_code) {
-	return StringOrValue(&r.process_to_string(*body_code), 0);
+	return StringOrValue(r.process_to_string(*body_code));
 }
 
 /* @todo maybe network order worth spending some effort?
@@ -507,19 +513,17 @@ static void locked_process_and_cache_put
 	Locked_process_and_cache_put_action_info& info=
 		*static_cast<Locked_process_and_cache_put_action_info *>(context);
 
+
+	const String* body_from_disk=info.scope->body_from_disk;
 	// body->process 
 	Try_catch_result result=try_catch(*info.r, 
 		process_cache_body_code, info.body_code,
-		info.catch_code);
+		info.catch_code, body_from_disk!=0 /*we have something old=we can handle=recover later*/);
 
 	if(result.exception_should_be_handled) {
 		if(*result.exception_should_be_handled==CACHE_EXCEPTION_HANDLED_CACHE_NAME) {
-			if(const String* body_from_disk=info.scope->body_from_disk) // we have something old?
-				info.processed_code=body_from_disk;
-			else
-				throw Exception(0,
-					new String("$"EXCEPTION_VAR_NAME"."EXCEPTION_HANDLED_PART_NAME"["CACHE_EXCEPTION_HANDLED_CACHE_NAME"]"),
-					"fallback failed - there is no old cached body");
+			assert(body_from_disk);
+			info.processed_code=body_from_disk;
 		} else
 			throw Exception("parser.runtime",
 				result.exception_should_be_handled,