changeset 10557:c636b4399ffa

Merge
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Thu, 27 Jun 2013 21:03:55 +0200
parents 35783fbfcf28 (current diff) 97caf20971ed (diff)
children 60ce5bd6e104
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Thu Jun 27 11:44:15 2013 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java	Thu Jun 27 21:03:55 2013 +0200
@@ -165,12 +165,11 @@
                 }
 
                 String className = je.getName().substring(0, je.getName().length() - ".class".length());
-                className = className.replace('/', '.');
                 classFileCounter++;
 
                 try {
                     // Load and initialize class
-                    Class<?> javaClass = Class.forName(className, true, loader);
+                    Class<?> javaClass = Class.forName(className.replace('/', '.'), true, loader);
 
                     // Pre-load all classes in the constant pool.
                     try {
@@ -181,7 +180,7 @@
                         }
                     } catch (Throwable t) {
                         // If something went wrong during pre-loading we just ignore it.
-                        TTY.println("CompileTheWorld (%d) : Preloading failed for %s", classFileCounter, className);
+                        TTY.println("Preloading failed for (%d) %s", classFileCounter, className);
                     }
 
                     // Are we compiling this class?