Mercurial > hg > openjdk > jdk9 > nashorn

changeset 1596:da61004610e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8147070: Dynalink GuardedInvocation must check the Class object passed Reviewed-by: hannesw, mhaupt, attila
author sundar
date Thu, 14 Jan 2016 15:35:43 +0530
parents 0f21903deef8
children 2247904a107c
files src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java	Thu Jan 14 10:55:26 2016 +0100
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/linker/GuardedInvocation.java	Thu Jan 14 15:35:43 2016 +0530
@@ -202,6 +202,9 @@
         this.invocation = Objects.requireNonNull(invocation);
         this.guard = guard;
         this.switchPoints = switchPoint == null ? null : new SwitchPoint[] { switchPoint };
+        if (exception != null && !Throwable.class.isAssignableFrom(exception)) {
+            throw new IllegalArgumentException(exception.getName() + " is not assignable from Throwable");
+        }
         this.exception = exception;
     }
 
@@ -228,6 +231,9 @@
         this.invocation = Objects.requireNonNull(invocation);
         this.guard = guard;
         this.switchPoints = switchPoints == null ? null : switchPoints.clone();
+        if (exception != null && !Throwable.class.isAssignableFrom(exception)) {
+            throw new IllegalArgumentException(exception.getName() + " is not assignable from Throwable");
+        }
         this.exception = exception;
     }