Skip to content

Commit b295d6d

Browse files
author
diego Dupin
committed
[CONJ-912] remove security manager code (JEP 411)
1 parent 5b98d76 commit b295d6d

File tree

4 files changed

+7
-26
lines changed

4 files changed

+7
-26
lines changed

src/main/java/org/mariadb/jdbc/Connection.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -699,11 +699,6 @@ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLExc
699699
throw exceptionFactory.create(
700700
"Connection.setNetworkTimeout cannot be called with a negative timeout");
701701
}
702-
SQLPermission sqlPermission = new SQLPermission("setNetworkTimeout");
703-
SecurityManager securityManager = System.getSecurityManager();
704-
if (securityManager != null) {
705-
securityManager.checkPermission(sqlPermission);
706-
}
707702
getContext().addStateFlag(ConnectionState.STATE_NETWORK_TIMEOUT);
708703

709704
lock.lock();

src/main/java/org/mariadb/jdbc/client/impl/StandardClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -822,11 +822,6 @@ public Context getContext() {
822822

823823
public void abort(Executor executor) throws SQLException {
824824

825-
SQLPermission sqlPermission = new SQLPermission("callAbort");
826-
SecurityManager securityManager = System.getSecurityManager();
827-
if (securityManager != null) {
828-
securityManager.checkPermission(sqlPermission);
829-
}
830825
if (executor == null) {
831826
throw exceptionFactory.create("Cannot abort the connection: null executor passed");
832827
}

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -449,16 +449,7 @@ public void networkTimeoutTest() throws SQLException {
449449
try (Connection connection = createCon()) {
450450
assertEquals(0, connection.getNetworkTimeout());
451451
int timeout = 1000;
452-
SQLPermission sqlPermission = new SQLPermission("setNetworkTimeout");
453-
SecurityManager securityManager = System.getSecurityManager();
454-
if (securityManager != null) {
455-
try {
456-
securityManager.checkPermission(sqlPermission);
457-
} catch (SecurityException se) {
458-
System.out.println("test 'setNetworkTimeout' skipped due to missing policy");
459-
return;
460-
}
461-
}
452+
462453
Executor executor = Runnable::run;
463454
connection.setNetworkTimeout(executor, timeout);
464455
connection.isValid(2);

src/test/java/org/mariadb/jdbc/integration/LoggingTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ void basicLogging() throws Exception {
102102
+ "+--------------------------------------------------+------------------+\n"
103103
+ "| 02 00 00 04 01 31 | .....1 |\n"
104104
+ "+--------------------------------------------------+------------------+\n";
105-
Assertions.assertTrue(
106-
contents.contains(rowResult)
107-
|| contents.contains(rowResult.replace("\r\n", "\n"))
108-
|| contents.contains(rowResultWithEof)
109-
|| contents.contains(rowResultWithEof.replace("\r\n", "\n")),
110-
contents);
105+
Assertions.assertTrue(
106+
contents.contains(rowResult)
107+
|| contents.contains(rowResult.replace("\r\n", "\n"))
108+
|| contents.contains(rowResultWithEof)
109+
|| contents.contains(rowResultWithEof.replace("\r\n", "\n")),
110+
contents);
111111

112112
Assertions.assertTrue(
113113
contents.contains("pool MariaDB-pool new physical connection ")

0 commit comments

Comments
 (0)