# HG changeset patch # User bgopularam # Date 1465798774 25200 # Node ID 57d7bbc02fa6bc900068f4210a5f041c290ddf28 # Parent c79987d8e3bc3a20b2b312c0837d43120859e980 8062758: Update java/security/Security/ClassLoaderDeadlock/Deadlock2.sh with the removal of -Djava.ext.dirs Summary: Removing test as java.ext.dirs not supported Reviewed-by: mchung, mullan diff -r c79987d8e3bc -r 57d7bbc02fa6 jdk/test/ProblemList.txt --- a/jdk/test/ProblemList.txt Mon Jun 13 09:31:20 2016 -0600 +++ b/jdk/test/ProblemList.txt Sun Jun 12 23:19:34 2016 -0700 @@ -215,8 +215,6 @@ sun/security/mscapi/ShortRSAKey1024.sh 8153948 windows-all -java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 8062758 generic-all - sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java 8026393 generic-all sun/security/pkcs11/Cipher/ReinitCipher.java 8077138,8023434 windows-all diff -r c79987d8e3bc -r 57d7bbc02fa6 jdk/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java --- a/jdk/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java Mon Jun 13 09:31:20 2016 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2009, 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 java.io.*; -import sun.misc.*; - -public class CreateSerialized { - public static void main(String[] args) throws Exception { - Object o = new com.sun.crypto.provider.SunJCE(); - - FileOutputStream fos = new FileOutputStream("object.tmp"); - ObjectOutputStream objectOutputStream = new ObjectOutputStream(fos); - objectOutputStream.writeObject(o); - fos.close(); - } -} diff -r c79987d8e3bc -r 57d7bbc02fa6 jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java --- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java Mon Jun 13 09:31:20 2016 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2009, 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 java.io.*; -import javax.xml.parsers.DocumentBuilderFactory; -import java.security.*; - -public class Deadlock2 { - public static void main(String[] args) throws Exception { - File file = new File("object.tmp"); - final byte[] bytes = new byte[(int) file.length()]; - FileInputStream fileInputStream = new FileInputStream(file); - int read = fileInputStream.read(bytes); - if (read != file.length()) { - throw new Exception("Didn't read all"); - } - Thread.sleep(1000); - - Runnable xmlRunnable = new Runnable() { - public void run() { - try { - DocumentBuilderFactory.newInstance(); - } catch (Exception e) { - e.printStackTrace(); - } - } - }; - - Runnable readObjectRunnable = new Runnable() { - public void run() { - try { - ObjectInputStream objectInputStream = - new ObjectInputStream(new ByteArrayInputStream(bytes)); - Object o = objectInputStream.readObject(); - System.out.println(o.getClass()); - } catch (Exception e) { - e.printStackTrace(); - } - } - }; - - Thread thread1 = new Thread(readObjectRunnable, "Read Object"); - Thread thread2 = new Thread(xmlRunnable, "XML"); - - thread1.start(); - thread2.start(); - - thread1.join(); - thread2.join(); - } -} diff -r c79987d8e3bc -r 57d7bbc02fa6 jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh --- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Mon Jun 13 09:31:20 2016 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,115 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 2009, 2012, 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 6440846 -# @summary make sure we do not deadlock between ExtClassLoader and AppClassLoader -# @author Valerie Peng -# @run shell/timeout=20 Deadlock2.sh - -# set a few environment variables so that the shell-script can run stand-alone -# in the source directory - -if [ "${TESTSRC}" = "" ] ; then - TESTSRC="." -fi - -if [ "${TESTCLASSES}" = "" ] ; then - TESTCLASSES="." -fi - -if [ "${TESTJAVA}" = "" ] ; then - echo "TESTJAVA not set. Test cannot execute." - echo "FAILED!!!" - exit 1 -fi - -if [ "${COMPILEJAVA}" = "" ]; then - COMPILEJAVA="${TESTJAVA}" -fi - -# set platform-dependent variables -OS=`uname -s` -case "$OS" in - SunOS ) - PATHSEP=":" - FILESEP="/" - ;; - Linux ) - PATHSEP=":" - FILESEP="/" - ;; - CYGWIN* ) - PATHSEP=";" - FILESEP="/" - ;; - Darwin ) - PATHSEP=":" - FILESEP="/" - ;; - AIX ) - PATHSEP=":" - FILESEP="/" - ;; - Windows* ) - PATHSEP=";" - FILESEP="\\" - ;; - * ) - echo "Unrecognized system!" - exit 1; - ;; -esac - -# remove old class files -cd ${TESTCLASSES} -if [ -d testlib ] ; then - rm -rf testlib -fi -mkdir testlib - -# compile and package the test program -${COMPILEJAVA}${FILESEP}bin${FILESEP}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \ - -d ${TESTCLASSES} \ - ${TESTSRC}${FILESEP}CreateSerialized.java \ - ${TESTSRC}${FILESEP}Deadlock2.java - -${COMPILEJAVA}${FILESEP}bin${FILESEP}jar ${TESTTOOLVMOPTS} \ - -cvf testlib${FILESEP}Deadlock2.jar \ - Deadlock2*.class - -rm Deadlock2*.class - -# create serialized object and run the test -${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} CreateSerialized -${TESTJAVA}${FILESEP}bin${FILESEP}java ${TESTVMOPTS} \ - -Djava.ext.dirs=${TESTCLASSES}${FILESEP}testlib${PATHSEP}${TESTJAVA}${FILESEP}lib${FILESEP}ext Deadlock2 -STATUS=$? - -# clean up -rm object.tmp CreateSerialized.class -rm -rf testlib -exit ${STATUS}