changeset 38148:858b9417656d

Merge
author ecaspole
date Fri, 29 Apr 2016 18:00:57 +0200
parents 1fa5504cd68d c020feaafdcb
children 22d89ca22f98
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Tue Apr 26 23:29:51 2016 +0530
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Fri Apr 29 18:00:57 2016 +0200
@@ -5800,8 +5800,8 @@
       guarantee_property(super_class_name == vmSymbols::java_lang_Object(),
         "Interfaces must have java.lang.Object as superclass in class file %s",
         CHECK);
-      }
-      _super_klass = (const InstanceKlass*)
+    }
+    _super_klass = (const InstanceKlass*)
                        SystemDictionary::resolve_super_or_fail(_class_name,
                                                                super_class_name,
                                                                _loader_data->class_loader(),