From 604bd3671121b51f977de146ed95484c2297fb3e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 1 Nov 2019 11:09:52 +0100 Subject: PG_FINALLY This gives an alternative way of catching exceptions, for the common case where the cleanup code is the same in the error and non-error cases. So instead of PG_TRY(); { ... code that might throw ereport(ERROR) ... } PG_CATCH(); { cleanup(); PG_RE_THROW(); } PG_END_TRY(); cleanup(); one can write PG_TRY(); { ... code that might throw ereport(ERROR) ... } PG_FINALLY(); { cleanup(); } PG_END_TRY(); Discussion: https://www.postgresql.org/message-id/flat/95a822c3-728b-af0e-d7e5-71890507ae0c%402ndquadrant.com --- src/backend/commands/subscriptioncmds.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/backend/commands/subscriptioncmds.c') diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c index 2e67a5889e5..14191957665 100644 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@ -493,16 +493,11 @@ CreateSubscription(CreateSubscriptionStmt *stmt, bool isTopLevel) slotname))); } } - PG_CATCH(); + PG_FINALLY(); { - /* Close the connection in case of failure. */ walrcv_disconnect(wrconn); - PG_RE_THROW(); } PG_END_TRY(); - - /* And we are done with the remote side. */ - walrcv_disconnect(wrconn); } else ereport(WARNING, @@ -1023,16 +1018,12 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel) walrcv_clear_result(res); } - PG_CATCH(); + PG_FINALLY(); { - /* Close the connection in case of failure */ walrcv_disconnect(wrconn); - PG_RE_THROW(); } PG_END_TRY(); - walrcv_disconnect(wrconn); - pfree(cmd.data); table_close(rel, NoLock); -- cgit v1.2.3