# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1372359835 -7200
# Node ID c636b4399ffa66e7d45d9edb185aa85d60cd18f9
# Parent  35783fbfcf28c22cc4845d65c5f991b81a759b9b# Parent  97caf20971ed169ccd5ac6f716094090fae6f156
Merge

diff -r 35783fbfcf28 -r c636b4399ffa graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompileTheWorld.java
--- 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?