Index: build/custom/msvc_2003/vmcore/vmcore.vcproj
===================================================================
--- build/custom/msvc_2003/vmcore/vmcore.vcproj (revision 572934)
+++ build/custom/msvc_2003/vmcore/vmcore.vcproj (working copy)
@@ -1284,6 +1284,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: vm/vmcore/src/verifier-3363/vf_resolve.cpp
===================================================================
--- vm/vmcore/src/verifier-3363/vf_resolve.cpp (revision 572934)
+++ vm/vmcore/src/verifier-3363/vf_resolve.cpp (working copy)
@@ -77,25 +77,12 @@
const char *name, // resolved class name
bool need_load) // load flag
{
+ // get class loader
+ classloader_handler class_loader = class_get_class_loader( k_class );
if( need_load ) {
- return cl_load_class( class_get_class_loader( k_class ), name );
+ return cl_load_class( class_loader, name );
} else {
- // get class loader
- classloader_handler class_loader = 0;
- class_handler sup = k_class;
-
- while( sup ) {
- classloader_handler class_loader2 = class_get_class_loader( sup );
- if( class_loader != class_loader2 ) {
- class_loader = class_loader2;
- class_handler result = cl_get_class( class_loader, name );
- if( result ) {
- return result;
- }
- }
- sup = class_get_super_class(sup);
- }
- return 0;
+ return cl_get_class( class_loader, name );
}
} // vf_resolve_class