8196959: NullPointerException in discovery003.java
Fixed corner case of having engineName as NULL Reviewed-by: jlaskey
This commit is contained in:
parent
a95d50a5fc
commit
8a170b8042
src/java.scripting/share/classes/javax/script
test/jdk/javax/script/JDK_8196959
@ -77,7 +77,10 @@ public class ScriptEngineManager {
|
||||
|
||||
private void init(final ClassLoader loader) {
|
||||
globalScope = new SimpleBindings();
|
||||
engineSpis = new TreeSet<ScriptEngineFactory>(Comparator.comparing(ScriptEngineFactory::getEngineName));
|
||||
engineSpis = new TreeSet<ScriptEngineFactory>(Comparator.comparing(
|
||||
ScriptEngineFactory::getEngineName,
|
||||
Comparator.nullsLast(Comparator.naturalOrder()))
|
||||
);
|
||||
nameAssociations = new HashMap<String, ScriptEngineFactory>();
|
||||
extensionAssociations = new HashMap<String, ScriptEngineFactory>();
|
||||
mimeTypeAssociations = new HashMap<String, ScriptEngineFactory>();
|
||||
|
80
test/jdk/javax/script/JDK_8196959/BadFactory.java
Normal file
80
test/jdk/javax/script/JDK_8196959/BadFactory.java
Normal file
@ -0,0 +1,80 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import javax.script.*;
|
||||
import java.util.*;
|
||||
|
||||
// do many bad things to prevent ScriptEngineManager to run correctly
|
||||
public class BadFactory implements ScriptEngineFactory {
|
||||
public String getEngineName() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getEngineVersion() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public List<String> getExtensions() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getLanguageName() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getLanguageVersion() {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getMethodCallSyntax(String obj, String m, String[] args) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public List<String> getMimeTypes() {
|
||||
List<String> list = new ArrayList<String>();
|
||||
list.add("application/bad");
|
||||
list.add(null);
|
||||
list.add("");
|
||||
return list;
|
||||
}
|
||||
|
||||
public List<String> getNames() {
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
public String getOutputStatement(String str) {
|
||||
return "bad-factory-output";
|
||||
}
|
||||
|
||||
public String getParameter(String key) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public String getProgram(String[] statements) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public ScriptEngine getScriptEngine() {
|
||||
return null;
|
||||
}
|
||||
}
|
30
test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
Normal file
30
test/jdk/javax/script/JDK_8196959/BadFactoryTest.java
Normal file
@ -0,0 +1,30 @@
|
||||
/**
|
||||
* Copyright (c) 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import javax.script.ScriptEngineManager;
|
||||
|
||||
public class BadFactoryTest {
|
||||
public static void main(String[] args) {
|
||||
ScriptEngineManager m = new ScriptEngineManager();
|
||||
}
|
||||
}
|
60
test/jdk/javax/script/JDK_8196959/BadFactoryTest.sh
Normal file
60
test/jdk/javax/script/JDK_8196959/BadFactoryTest.sh
Normal file
@ -0,0 +1,60 @@
|
||||
#
|
||||
# Copyright (c) 2018, 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
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
# @test
|
||||
# @bug 8196959
|
||||
# @summary BadFactory that results in NPE being thrown from ScriptEngineManager
|
||||
#
|
||||
# @build BadFactory BadFactoryTest
|
||||
# @run shell BadFactoryTest.sh
|
||||
|
||||
if [ "${TESTSRC}" = "" ]
|
||||
then
|
||||
echo "TESTSRC not set. Test cannot execute. Failed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
. ${TESTSRC}/../CommonSetup.sh
|
||||
|
||||
echo "Creating JAR file ..."
|
||||
|
||||
$JAR ${TESTTOOLVMOPTS} -cf ${TESTCLASSES}/badfactory.jar \
|
||||
-C ${TESTCLASSES} BadFactory.class \
|
||||
-C ${TESTCLASSES} BadFactoryTest.class \
|
||||
-C "${TESTSRC}" META-INF/services/javax.script.ScriptEngineFactory
|
||||
|
||||
echo "Running test with security manager ..."
|
||||
$JAVA ${TESTVMOPTS} -Djava.security.manager -classpath \
|
||||
"${TESTCLASSES}${PS}${TESTCLASSES}/badfactory.jar" \
|
||||
BadFactoryTest
|
||||
|
||||
ret=$?
|
||||
if [ $ret -ne 0 ]
|
||||
then
|
||||
exit $ret
|
||||
fi
|
||||
|
||||
echo "Running test without security manager ..."
|
||||
$JAVA ${TESTVMOPTS} -classpath \
|
||||
"${TESTCLASSES}${PS}${TESTCLASSES}/badfactoty.jar" \
|
||||
BadFactoryTest
|
@ -0,0 +1,2 @@
|
||||
# Factory that does many bad things to stress ScriptEngineManager
|
||||
BadFactory
|
Loading…
x
Reference in New Issue
Block a user