--- parser3/src/classes/op.C	2016/04/17 20:20:48	1.227
+++ parser3/src/classes/op.C	2016/05/11 22:28:48	1.229
@@ -18,7 +18,7 @@
 #include "pa_vclass.h"
 #include "pa_charset.h"
 
-volatile const char * IDENT_OP_C="$Id: op.C,v 1.227 2016/04/17 20:20:48 moko Exp $";
+volatile const char * IDENT_OP_C="$Id: op.C,v 1.229 2016/05/11 22:28:48 moko Exp $";
 
 // limits
 
@@ -522,17 +522,28 @@ struct Try_catch_result {
 
 	Try_catch_result(): exception_should_be_handled(0) {}
 };
+
+/// Auto-object used for temporary changing Request::skip.
+class Temp_skip {
+	Request& frequest;
+	Request::Skip saved_skip;
+public:
+	Temp_skip(Request& arequest) : frequest(arequest), saved_skip(arequest.get_skip()) {
+		arequest.set_skip(Request::SKIP_NOTHING);
+	}
+	~Temp_skip() {
+		if(frequest.get_skip() == Request::SKIP_NOTHING)
+			frequest.set_skip(saved_skip);
+	}
+};
 #endif
 
 /// used by ^try and ^cache, @returns $exception.handled[string] if any
 template<class I>
-static Try_catch_result try_catch(Request& r, 
-		  StringOrValue body_code(Request&, I), I info, 
-		  Value* catch_code,
-		  bool could_be_handled_by_caller=false) 
-{
+static Try_catch_result try_catch(Request& r, StringOrValue body_code(Request&, I), I info, Value* catch_code, bool could_be_handled_by_caller=false) {
 	Try_catch_result result;
 
+	// minor bug: context not restored if only finally code is present, see #1062
 	if(!catch_code) {
 		result.processed_code=body_code(r, info);
 		return result;
@@ -543,39 +554,30 @@ static Try_catch_result try_catch(Reques
 	try {
 		result.processed_code=body_code(r, info);
 	} catch(const Exception& e) {
-		Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error]
 		Request::Exception_details details=r.get_details(e);
-		try_context.restore(); // restoring try-context to perform catch-code
-
-		Junction* junction=catch_code->get_junction();
-		Value* method_frame=junction->method_frame;
-		Value* saved_exception_var_value=method_frame->get_element(exception_var_name);
-		VMethodFrame& frame=*junction->method_frame;
-		frame.put_element(exception_var_name, &details.vhash);
+		try_context.restore(); // restoring try-context for code after try and catch-code
 
-		result.processed_code=r.process(*catch_code);
+		{
+			Temp_value_element temp(r, *catch_code->get_junction()->method_frame, exception_var_name, &details.vhash);
+			Temp_skip temp_skip(r);
+			result.processed_code=r.process(*catch_code);
+		}
 		
-		// retriving $exception.handled, restoring $exception var
+		// retriving $exception.handled
 		Value* vhandled=details.vhash.hash().get(exception_handled_part_name);
-		frame.put_element(exception_var_name, saved_exception_var_value);
 
 		bool bhandled=false;
 		if(vhandled) {
 			if(vhandled->is_string()) { // not simple $exception.handled(1/0)?
-				if(could_be_handled_by_caller) { // and we can possibly handle it
+				if(bhandled=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) {
-			throw_context.restore(); // restoring throw-context [exception were not handled]
+		if(!bhandled)
 			rethrow;
-		}
 	}
 
 	return result;
@@ -689,12 +691,14 @@ const String* locked_process_and_cache_p
 		cache_delete(file_spec);
 	return result;
 }
+
 #ifndef DOXYGEN
 struct Cache_get_result {
 	const String* body;
 	bool expired;
 };
 #endif
+
 static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) {
 	Cache_get_result result={0, false};
 
@@ -731,9 +735,11 @@ static time_t as_expires(Request& r, Met
 	
 	return result;
 }
+
 static const String& as_file_spec(Request& r, MethodParams& params, int index) {
 	return r.absolute(params.as_string(index, "filespec must be string"));
 }
+
 static void _cache(Request& r, MethodParams& params) {
 	if(params.count()==0) {
 		// ^cache[] -- return current expiration time
@@ -829,16 +835,26 @@ static void _try_operator(Request& r, Me
 
 	Try_catch_result result;
 	StringOrValue finally_result;
+
 	try{
+		// process try and catch code
 		result=try_catch(r, process_try_body_code, &body_code, &catch_code);
 	} catch(...){
-		if(finally_code)
+		// process finally code but ignore the result
+		if(finally_code){
+			Temp_skip temp(r);
 			finally_result=r.process(*finally_code);
+		}
 		rethrow;
 	}
 
-	if(finally_code)
+	// process finally code
+	if(finally_code){
+		Temp_skip temp(r);
 		finally_result=r.process(*finally_code);
+	}
+
+	// no exception in try, catch or finally, writing the result
 
 	// write out processed body_code or catch_code
 	r.write_pass_lang(result.processed_code);