ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 16:58:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix recent regression in findInHierarchy

Browse Source
This commit is contained in:
Joel Dice 2009-08-04 08:42:16 -06:00
parent aa6e3048b3
commit f8bf83bfec
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/machine.cpp
View File

@ -2907,7 +2907,6 @@ findInHierarchy(Thread* t, object class_, object name, object spec,
object (*makeError)(Thread*, object)) object (*makeError)(Thread*, object))
{ {
object originalClass = class_; object originalClass = class_;
PROTECT(t, class_);
object o = 0; object o = 0;
if ((classFlags(t, class_) & ACC_INTERFACE) if ((classFlags(t, class_) & ACC_INTERFACE)
@ -2919,7 +2918,7 @@ findInHierarchy(Thread* t, object class_, object name, object spec,
if (o == 0) { if (o == 0) {
if (find == findFieldInClass) { if (find == findFieldInClass) {
o = findInInterfaces(t, class_, name, spec, find); o = findInInterfaces(t, originalClass, name, spec, find);
} }
for (; o == 0 and class_; class_ = classSuper(t, class_)) { for (; o == 0 and class_; class_ = classSuper(t, class_)) {
@ -2927,7 +2926,7 @@ findInHierarchy(Thread* t, object class_, object name, object spec,
} }
if (o == 0 and find == findMethodInClass) { if (o == 0 and find == findMethodInClass) {
o = findInInterfaces(t, class_, name, spec, find); o = findInInterfaces(t, originalClass, name, spec, find);
} }
} }