# HG changeset patch
# User hseigel
# Date 1408997009 14400
# Node ID fa0cf025abd4ea83b8018035bff36021b1b6f2ae
# Parent  72fa1e83e5f906b1605d2cb8313a5d7b9a090dfd# Parent  cec4a29245f5382004b9e53b63e9c41de97a2c89
Merge

diff -r cec4a29245f5 -r fa0cf025abd4 src/share/vm/classfile/classFileParser.cpp
--- a/src/share/vm/classfile/classFileParser.cpp	Mon Aug 25 11:15:30 2014 -0700
+++ b/src/share/vm/classfile/classFileParser.cpp	Mon Aug 25 16:03:29 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}}