# HG changeset patch
# User zgu
# Date 1367855378 25200
# Node ID da4d8777078173c1c001b6a7ebbf3aef0bcb2ba1
# Parent  800078be49d2f3c22d3470df74181b8d3ba68794# Parent  c18152e0554ef3460e0eb78452ad3c4be38aaed8
Merge

diff -r c18152e0554e -r da4d87770781 src/share/vm/classfile/systemDictionary.cpp
--- a/src/share/vm/classfile/systemDictionary.cpp	Mon May 06 11:15:13 2013 -0400
+++ b/src/share/vm/classfile/systemDictionary.cpp	Mon May 06 08:49:38 2013 -0700
@@ -830,7 +830,7 @@
             Klass *kk;
             {
               MutexLocker mu(SystemDictionary_lock, THREAD);
-              kk = find_class(name, ik->class_loader_data());
+              kk = find_class(d_index, d_hash, name, ik->class_loader_data());
             }
             if (kk != NULL) {
               // No clean up is needed if the shared class has been entered