ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-03 19:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

don't throw an exception from resolveClass when throw_ == false

Browse Source 
resolveClass was correctly respecting throw_ == false if the requested
class was not found, but it still threw an exception if e.g. the
superclass was missing.  Now we catch such exceptions and return null
as appropriate.
This commit is contained in:
Joel Dice 2012-08-29 18:34:51 -06:00
parent 7534eecdb3
commit 9ceacf16e9
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/machine.cpp
View File

@ -3983,6 +3983,17 @@ parseClass(Thread* t, object loader, const uint8_t* data, unsigned size,
return real;
}
uint64_t
runParseClass(Thread* t, uintptr_t* arguments)
{
object loader = reinterpret_cast<object>(arguments[0]);
System::Region* region = reinterpret_cast<System::Region*>(arguments[1]);
Machine::Type throwType = static_cast<Machine::Type>(arguments[2]);
return reinterpret_cast<uintptr_t>
(parseClass(t, loader, region->start(), region->length(), throwType));
}
object
resolveSystemClass(Thread* t, object loader, object spec, bool throw_,
Machine::Type throwType)
@ -4028,9 +4039,24 @@ resolveSystemClass(Thread* t, object loader, object spec, bool throw_,
{ THREAD_RESOURCE(t, System::Region*, region, region->dispose());
uintptr_t arguments[] = { reinterpret_cast<uintptr_t>(loader),
reinterpret_cast<uintptr_t>(region),
static_cast<uintptr_t>(throwType) };
// parse class file
class_ = parseClass
(t, loader, region->start(), region->length(), throwType);
class_ = reinterpret_cast<object>
(runRaw(t, runParseClass, arguments));
if (UNLIKELY(t->exception)) {
if (throw_) {
object e = t->exception;
t->exception = 0;
vm::throw_(t, e);
} else {
t->exception = 0;
return 0;
}
}
}
if (Verbose) {