Skip to content

Commit f40f7db

Browse files
committed
Fix gbak exception handlers.
1 parent c4e15dc commit f40f7db

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/burp/backup.epp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -924,15 +924,16 @@ SINT64 get_gen_id( const TEXT* name, SSHORT name_len)
924924
getGenerator.singleSelect(tdgbl->tr_handle, &getGen);
925925
return getGen->id;
926926
}
927-
catch (const Firebird::FbException& ex)
927+
catch (const status_exception& ex)
928928
{
929-
Firebird::IStatus* st = ex.getStatus();
929+
LocalStatus ls;
930+
ex.stuffException(&ls);
930931

931932
// if there's no gen_id, never mind ...
932-
if (st->getErrors()[1] == isc_dsql_error)
933+
if (ls.getErrors()[1] == isc_dsql_error)
933934
return 0;
934935

935-
BURP_error_redirect(st, 25);
936+
BURP_error_redirect(&ls, 25);
936937
// msg 25 Failed in put_blr_gen_id
937938
}
938939
return 0; // warning silencer

src/burp/restore.epp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8658,9 +8658,9 @@ bool get_mapping(BurpGlobals* tdgbl)
86588658
BurpSql mapRole(tdgbl, sql.c_str());
86598659
mapRole.execute(tdgbl->tr_handle);
86608660
}
8661-
catch (const Firebird::FbException& ex)
8661+
catch (const status_exception& ex)
86628662
{
8663-
fb_utils::copyStatus(&tdgbl->status_vector, ex.getStatus());
8663+
ex.stuffException(&tdgbl->status_vector);
86648664
general_on_error ();
86658665
}
86668666
}
@@ -11589,9 +11589,9 @@ void fix_generator(BurpGlobals* tdgbl, const FixGenerator* g)
1158911589
BurpSql fixGen(tdgbl, sql.c_str());
1159011590
fixGen.execute(gds_trans);
1159111591
}
11592-
catch (const Firebird::FbException& ex)
11592+
catch (const status_exception& ex)
1159311593
{
11594-
fb_utils::copyStatus(&tdgbl->status_vector, ex.getStatus());
11594+
ex.stuffException(&tdgbl->status_vector);
1159511595

1159611596
if (tdgbl->status_vector->getErrors()[1] == isc_dsql_error)
1159711597
{

0 commit comments

Comments
 (0)