Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doPrivileged missing from abort path #10394

Merged
merged 1 commit into from
Jan 14, 2020
Merged

doPrivileged missing from abort path #10394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions dev/com.ibm.ws.jdbc.4.1.feature/src/com/ibm/ws/jdbc/osgi/v41/JDBC41Runtime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2014, 2017 IBM Corporation and others.
* Copyright (c) 2014, 2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -10,6 +10,9 @@
*******************************************************************************/
package com.ibm.ws.jdbc.osgi.v41;

import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.sql.BatchUpdateException;
import java.sql.CallableStatement;
import java.sql.Connection;
Expand Down Expand Up @@ -131,9 +134,17 @@ public String doGetSchema(Connection sqlConn) throws SQLException {
}

@Override
public void doAbort(Connection sqlConn, Executor ex) throws SQLException {
public void doAbort(final Connection sqlConn, final Executor ex) throws SQLException {
try {
sqlConn.abort(ex);
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws SQLException {
sqlConn.abort(ex);
return null;
}
});
} catch (PrivilegedActionException x) {
throw (SQLException) x.getCause();
} catch (IncompatibleClassChangeError e) { // pre-4.1 driver
throw new SQLFeatureNotSupportedException(e);
}
Expand Down Expand Up @@ -188,8 +199,10 @@ public boolean doSetShardingKeysIfValid(Connection con, Object shardingKey, Obje
}

@Override
public void beginRequest(Connection con) {}
public void beginRequest(Connection con) {
}

@Override
public void endRequest(Connection con) {}
public void endRequest(Connection con) {
}
}
23 changes: 18 additions & 5 deletions dev/com.ibm.ws.jdbc.4.2.feature/src/com/ibm/ws/jdbc/osgi/v42/JDBC42Runtime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017 IBM Corporation and others.
* Copyright (c) 2017,2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -10,6 +10,9 @@
*******************************************************************************/
package com.ibm.ws.jdbc.osgi.v42;

import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.sql.BatchUpdateException;
import java.sql.CallableStatement;
import java.sql.Connection;
Expand Down Expand Up @@ -136,9 +139,17 @@ public String doGetSchema(Connection sqlConn) throws SQLException {
}

@Override
public void doAbort(Connection sqlConn, Executor ex) throws SQLException {
public void doAbort(final Connection sqlConn, final Executor ex) throws SQLException {
try {
sqlConn.abort(ex);
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws SQLException {
sqlConn.abort(ex);
return null;
}
});
} catch (PrivilegedActionException x) {
throw (SQLException) x.getCause();
} catch (IncompatibleClassChangeError e) { // pre-4.1 driver
throw new SQLFeatureNotSupportedException(e);
}
Expand Down Expand Up @@ -188,8 +199,10 @@ public boolean doSetShardingKeysIfValid(Connection con, Object shardingKey, Obje
}

@Override
public void beginRequest(Connection con) {}
public void beginRequest(Connection con) {
}

@Override
public void endRequest(Connection con) {}
public void endRequest(Connection con) {
}
}
17 changes: 14 additions & 3 deletions dev/com.ibm.ws.jdbc.4.3.feature/src/com/ibm/ws/jdbc/osgi/v43/JDBC43Runtime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 IBM Corporation and others.
* Copyright (c) 2018,2020 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand All @@ -10,6 +10,9 @@
*******************************************************************************/
package com.ibm.ws.jdbc.osgi.v43;

import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.sql.BatchUpdateException;
import java.sql.CallableStatement;
import java.sql.Connection;
Expand Down Expand Up @@ -142,9 +145,17 @@ public String doGetSchema(Connection sqlConn) throws SQLException {
}

@Override
public void doAbort(Connection sqlConn, Executor ex) throws SQLException {
public void doAbort(final Connection sqlConn, final Executor ex) throws SQLException {
try {
sqlConn.abort(ex);
AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws SQLException {
sqlConn.abort(ex);
return null;
}
});
} catch (PrivilegedActionException x) {
throw (SQLException) x.getCause();
} catch (IncompatibleClassChangeError e) { // pre-4.1 driver
throw new SQLFeatureNotSupportedException(e);
}
Expand Down