harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r565247 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp
Date Mon, 13 Aug 2007 05:53:34 GMT
Author: mloenko
Date: Sun Aug 12 22:53:33 2007
New Revision: 565247

URL: http://svn.apache.org/viewvc?view=rev&rev=565247
Log:
resolve classes in 'forced' case in similar way as 'unforced'

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp?view=diff&rev=565247&r1=565246&r2=565247
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/vf_resolve.cpp Sun Aug 12 22:53:33
2007
@@ -83,26 +83,24 @@
         const char *name,         // resolved class name
         bool need_load)      // load flag
     {
-        if( need_load ) {
-            return cl_load_class( class_get_class_loader( k_class ), name );
-        } else {
-            // get class loader
-            classloader_handler class_loader = 0;
-            class_handler sup = k_class;
+        // get class loader
+        classloader_handler class_loader = 0;
+        class_handler sup = k_class;
 
-            while( sup ) {
-                classloader_handler class_loader2 = class_get_class_loader( k_class );
-                if( class_loader != class_loader2 ) {
-                    class_loader = class_loader2;
-                    class_handler result = cl_get_class( class_loader, name );
-                    if( result ) {
-                        return result;
-                    }
+        while( sup ) {
+            classloader_handler class_loader2 = class_get_class_loader( sup );
+            if( class_loader != class_loader2 ) {
+                class_loader = class_loader2;
+
+                class_handler result = need_load ? cl_load_class( class_loader, name ) :
cl_get_class( class_loader, name );
+
+                if( result ) {
+                    return result;
                 }
-                sup = class_get_super_class(sup);
             }
-            return 0;
+            sup = class_get_super_class(sup);
         }
+        return 0;
     } // vf_resolve_class
 
 } // namespace CPVerifier



Mime
View raw message