# HG changeset patch
# User ehelin
# Date 1425901079 0
# Node ID 8db7e3b9922ba237ec8a957af524b4f17b052fa0
# Parent  2213171cca5be487e20b50f8b50aae9d99853537# Parent  e34bbcd36e535ef1cb62555869c1380b2e06f828
Merge

diff -r e34bbcd36e53 -r 8db7e3b9922b hotspot/src/share/vm/classfile/classLoaderData.cpp
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp	Mon Jan 26 10:32:35 2015 +0100
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp	Mon Mar 09 11:37:59 2015 +0000
@@ -902,7 +902,7 @@
 }
 
 Klass* ClassLoaderDataGraphKlassIteratorAtomic::next_klass() {
-  Klass* head = (Klass*)_next_klass;
+  Klass* head = _next_klass;
 
   while (head != NULL) {
     Klass* next = next_klass_in_cldg(head);
diff -r e34bbcd36e53 -r 8db7e3b9922b hotspot/src/share/vm/classfile/classLoaderData.hpp
--- a/hotspot/src/share/vm/classfile/classLoaderData.hpp	Mon Jan 26 10:32:35 2015 +0100
+++ b/hotspot/src/share/vm/classfile/classLoaderData.hpp	Mon Mar 09 11:37:59 2015 +0000
@@ -315,7 +315,7 @@
 
 // An iterator that distributes Klasses to parallel worker threads.
 class ClassLoaderDataGraphKlassIteratorAtomic : public StackObj {
-  volatile Klass* _next_klass;
+ Klass* volatile _next_klass;
  public:
   ClassLoaderDataGraphKlassIteratorAtomic();
   Klass* next_klass();