diff options
Diffstat (limited to 'src/pl/plperl/plperl.c')
| -rw-r--r-- | src/pl/plperl/plperl.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index c480999c51d..f0fb3085523 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1862,20 +1862,15 @@ plperl_call_handler(PG_FUNCTION_ARGS) else retval = plperl_func_handler(fcinfo); } - PG_CATCH(); + PG_FINALLY(); { current_call_data = save_call_data; activate_interpreter(oldinterp); if (this_call_data.prodesc) decrement_prodesc_refcount(this_call_data.prodesc); - PG_RE_THROW(); } PG_END_TRY(); - current_call_data = save_call_data; - activate_interpreter(oldinterp); - if (this_call_data.prodesc) - decrement_prodesc_refcount(this_call_data.prodesc); return retval; } @@ -1958,22 +1953,15 @@ plperl_inline_handler(PG_FUNCTION_ARGS) if (SPI_finish() != SPI_OK_FINISH) elog(ERROR, "SPI_finish() failed"); } - PG_CATCH(); + PG_FINALLY(); { if (desc.reference) SvREFCNT_dec_current(desc.reference); current_call_data = save_call_data; activate_interpreter(oldinterp); - PG_RE_THROW(); } PG_END_TRY(); - if (desc.reference) - SvREFCNT_dec_current(desc.reference); - - current_call_data = save_call_data; - activate_interpreter(oldinterp); - error_context_stack = pl_error_context.previous; PG_RETURN_VOID(); |