changeset 11786:8e12cb096db3 jdk8u102-b12

Merge
author asaha
date Mon, 13 Jun 2016 13:17:36 -0700
parents 9c557a821a6e 827b2350d7f8
children e172d8b2a8eb
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 06 13:20:07 2016 -0700
+++ b/.hgtags	Mon Jun 13 13:17:36 2016 -0700
@@ -601,6 +601,7 @@
 5e7489ac05f0001e234e6d1c8730b465e74c9626 jdk8u101-b09
 9486707c119ab3940f7ea06c1af23a4f6367c77b jdk8u101-b10
 a9136f8d24d9ed01009df847176e0be67b354d15 jdk8u101-b11
+3eab3ce82c31d1332bc383a1a3201eaee220c001 jdk8u101-b12
 39baa472e20c13c0eb1243eb5dce589e82f78143 jdk8u76-b00
 6ea3aea950d19d803475b3f4d704a2942e71b302 jdk8u76-b01
 4de4cffb5988cd68959ce4bbd14c6d4547078c91 jdk8u76-b02
--- a/src/share/classes/java/lang/invoke/MethodHandles.java	Mon Jun 06 13:20:07 2016 -0700
+++ b/src/share/classes/java/lang/invoke/MethodHandles.java	Mon Jun 13 13:17:36 2016 -0700
@@ -2847,7 +2847,7 @@
         int filterValues = filterType.parameterCount();
         if (filterValues == 0
                 ? (rtype != void.class)
-                : (rtype != filterType.parameterType(0)))
+                : (rtype != filterType.parameterType(0) || filterValues != 1))
             throw newIllegalArgumentException("target and filter types do not match", targetType, filterType);
     }