From 1c39decc2c7e55f2abfd85330ce8bada074fa7f1 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Tue, 5 Jan 2016 18:40:43 +0530 Subject: [PATCH 1/3] 8146240: Three nashorn files contain "GNU General Public License" header Reviewed-by: jlaskey --- nashorn/test/script/basic/JDK-8134488.js | 2 +- nashorn/test/script/basic/JDK-8134490.js | 2 +- nashorn/test/script/basic/JDK-8134939.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nashorn/test/script/basic/JDK-8134488.js b/nashorn/test/script/basic/JDK-8134488.js index 928961a2e7c..68b3ebb6bff 100644 --- a/nashorn/test/script/basic/JDK-8134488.js +++ b/nashorn/test/script/basic/JDK-8134488.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/nashorn/test/script/basic/JDK-8134490.js b/nashorn/test/script/basic/JDK-8134490.js index d7c10fdcc17..2a2a0129fab 100644 --- a/nashorn/test/script/basic/JDK-8134490.js +++ b/nashorn/test/script/basic/JDK-8134490.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/nashorn/test/script/basic/JDK-8134939.js b/nashorn/test/script/basic/JDK-8134939.js index 4f22ef0a075..0aa1b82fa07 100644 --- a/nashorn/test/script/basic/JDK-8134939.js +++ b/nashorn/test/script/basic/JDK-8134939.js @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it From 3b28163296792dde7b618b93f62c902d0ac857ed Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Wed, 6 Jan 2016 20:19:02 +0530 Subject: [PATCH 2/3] 8146556: jdk.dynalink.beans.ClassLinker can avoid using specific lookup and can use publicLookup instead Reviewed-by: jlaskey --- .../share/classes/jdk/dynalink/beans/ClassLinker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java index fdb3e1cbc5f..47db85f79f5 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/ClassLinker.java @@ -102,7 +102,7 @@ class ClassLinker extends BeanLinker { setPropertyGetter("static", FOR_CLASS, ValidationType.EXACT_CLASS); } - private static final MethodHandle FOR_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClass.class, + private static final MethodHandle FOR_CLASS = Lookup.PUBLIC.findStatic(StaticClass.class, "forClass", MethodType.methodType(StaticClass.class, Class.class)); } From 017a8a1f368f0ee089618aaede86a3184a9de808 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Thu, 7 Jan 2016 21:47:21 +0530 Subject: [PATCH 3/3] 8146625: OverloadedDynamicMethod has unused ClassLoader field that can be removed Reviewed-by: attila, hannesw --- .../dynalink/beans/OverloadedDynamicMethod.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java index 44965039b80..b54b32f54d5 100644 --- a/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java +++ b/nashorn/src/jdk.dynalink/share/classes/jdk/dynalink/beans/OverloadedDynamicMethod.java @@ -112,8 +112,7 @@ class OverloadedDynamicMethod extends DynamicMethod { /** * Holds a list of all methods. */ - private final LinkedList methods; - private final ClassLoader classLoader; + private final LinkedList methods = new LinkedList<>(); /** * Creates a new overloaded dynamic method. @@ -122,13 +121,7 @@ class OverloadedDynamicMethod extends DynamicMethod { * @param name the name of the method */ OverloadedDynamicMethod(final Class clazz, final String name) { - this(new LinkedList(), clazz.getClassLoader(), getClassAndMethodName(clazz, name)); - } - - private OverloadedDynamicMethod(final LinkedList methods, final ClassLoader classLoader, final String name) { - super(name); - this.methods = methods; - this.classLoader = classLoader; + super(getClassAndMethodName(clazz, name)); } @Override @@ -288,10 +281,6 @@ class OverloadedDynamicMethod extends DynamicMethod { return b.toString(); }; - ClassLoader getClassLoader() { - return classLoader; - } - private static boolean isApplicableDynamically(final LinkerServices linkerServices, final MethodType callSiteType, final SingleDynamicMethod m) { final MethodType methodType = m.getMethodType();