# HG changeset patch
# User hseigel
# Date 1409000718 14400
# Node ID 47e8e40b94d3d5c47df9351320ac70ebd9ced05f
# Parent  5b662570d9cfdc647847414f5f2b056318b8754e# Parent  fa0cf025abd4ea83b8018035bff36021b1b6f2ae
Merge

diff -r 5b662570d9cf -r 47e8e40b94d3 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Mon Aug 25 11:19:43 2014 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Mon Aug 25 17:05:18 2014 -0400
@@ -2780,7 +2780,7 @@
   ClassFileStream* cfs = stream();
   u1* current_start = cfs->current();
 
-  guarantee_property(attribute_byte_length > sizeof(u2),
+  guarantee_property(attribute_byte_length >= sizeof(u2),
                      "Invalid BootstrapMethods attribute length %u in class file %s",
                      attribute_byte_length,
                      CHECK);
@@ -2793,11 +2793,6 @@
                      "Short length on BootstrapMethods in class file %s",
                      CHECK);
 
-  guarantee_property(attribute_byte_length >= sizeof(u2),
-                     "Invalid BootstrapMethods attribute length %u in class file %s",
-                     attribute_byte_length,
-                     CHECK);
-
   // The attribute contains a counted array of counted tuples of shorts,
   // represending bootstrap specifiers:
   //    length*{bootstrap_method_index, argument_count*{argument_index}}