Skip to content

Commit 14c6de6

Browse files
committed
Improvement #8895 : 'invalid request BLR' puts actual error (and procedure where it happened) at the end where it is truncated by ISC API
1 parent 54cf13e commit 14c6de6

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/jrd/Function.epp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ Function* Function::loadMetadata(thread_db* tdbb, USHORT id, bool noscan, USHORT
472472
{
473473
StaticStatusVector temp_status;
474474
ex.stuffException(temp_status);
475-
(Arg::Gds(isc_bad_fun_BLR) << Arg::Str(name)
476-
<< Arg::StatusVector(temp_status.begin())).raise();
475+
(Arg::StatusVector(temp_status.begin()) <<
476+
Arg::Gds(isc_bad_fun_BLR) << Arg::Str(name)).raise();
477477
}
478478
}
479479
}
@@ -611,8 +611,8 @@ bool Function::reload(thread_db* tdbb)
611611
ex.stuffException(temp_status);
612612

613613
const string name = this->getName().toQuotedString();
614-
(Arg::Gds(isc_bad_fun_BLR) << Arg::Str(name)
615-
<< Arg::StatusVector(temp_status.begin())).raise();
614+
(Arg::StatusVector(temp_status.begin()) <<
615+
Arg::Gds(isc_bad_fun_BLR) << Arg::Str(name)).raise();
616616
}
617617
}
618618
catch (const Exception&)

src/jrd/met.epp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3735,8 +3735,8 @@ jrd_prc* MET_procedure(thread_db* tdbb, USHORT id, bool noscan, USHORT flags)
37353735
{
37363736
StaticStatusVector temp_status;
37373737
ex.stuffException(temp_status);
3738-
(Arg::Gds(isc_bad_proc_BLR) << name <<
3739-
Arg::StatusVector(temp_status.begin())).raise();
3738+
(Arg::StatusVector(temp_status.begin()) <<
3739+
Arg::Gds(isc_bad_proc_BLR) << name).raise();
37403740
}
37413741
}
37423742
}
@@ -3845,8 +3845,8 @@ bool jrd_prc::reload(thread_db* tdbb)
38453845
StaticStatusVector temp_status;
38463846
ex.stuffException(temp_status);
38473847

3848-
(Arg::Gds(isc_bad_proc_BLR) << this->getName().toQuotedString()
3849-
<< Arg::StatusVector(temp_status.begin())).raise();
3848+
(Arg::StatusVector(temp_status.begin()) <<
3849+
Arg::Gds(isc_bad_proc_BLR) << this->getName().toQuotedString()).raise();
38503850
}
38513851
}
38523852
catch (const Exception&)

0 commit comments

Comments
 (0)