stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Phil Race 2017-04-20 11:06:28 -07:00
commit c629c3c1d6
3 changed files with 4 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/java.sql/share/classes/javax/sql/PooledConnection.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, 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
@ -69,8 +69,9 @@ import java.sql.SQLException;
* <p>
* If the connection pool manager wraps or provides a proxy to the logical
* handle returned from a call to {@code PoolConnection.getConnection}, the pool
* manager must do
* one of the following when the application calls {@code Connection.close}:
* manager must do one of the following when the connection pool manager
* closes or returns the {@code PooledConnection} to the pool in response to
* the application calling {@code Connection.close}:
* <ul>
* <li>call {@code endRequest} on the logical {@code Connection} handle
* <li>call {@code close} on the logical {@code Connection} handle

1
jdk/test/TEST.groups
View File

@ -269,7 +269,6 @@ jdk_other = \
javax/transaction \
javax/xml \
-javax/xml/crypto \
jdk/asm \
jdk/internal/jline \
com/sun/jndi \
com/sun/corba \

69
jdk/test/jdk/asm/AsmSanity.java
View File

@ -1,69 +0,0 @@
/*
* Copyright (c) 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 7197401
* @summary Add a subset of the org.objectweb.asm packages to jdk8
* This test doesn't test asm functionality, it just tests the presence of
* asm in the jdk.
* These compile/run commands do the following:
* - Verify that asm is not in ct.sym so user code that refs it won't compile.
* - Verify that asm really is in rt.jar and can be accessed when ct.sym is not used.
* - Verify that if user code is compiled without ct.sym, it can't access asm classes
* at runtime when a security manager is in use.
*
* @modules java.base/jdk.internal.org.objectweb.asm
*
* @compile -XDignore.symbol.file=true AsmSanity.java
* @run main/othervm AsmSanity
*
* @run main/othervm/fail AsmSanity secure
*
*/
// Verify that the expected asm pkgs are present
import jdk.internal.org.objectweb.asm.*;
// Verify that we can actually run some of the asm code.
public class AsmSanity {
static public void main(String[] args) {
if (args.length == 0) {
System.out.println("-- Running without SecurityManager");
new Label();
System.out.println("-- Passed");
return;
}
if (args[0].equals("secure")) {
System.out.println("-- Running with SecurityManager");
java.lang.SecurityManager sm = new SecurityManager();
System.setSecurityManager(sm);
// This should cause an accessClassInPackage exception
new Label();
return;
}
throw new Error("-- Failed: Unknown argument to main: " + args[0]);
}
}