You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2022/05/12 16:08:42 UTC
svn commit: r1900840 - in /db/derby/code/trunk/java: org.apache.derby.client/org/apache/derby/client/net/ org.apache.derby.commons/org/apache/derby/shared/common/error/ org.apache.derby.commons/org/apache/derby/shared/common/info/ org.apache.derby.engi...
Author: rhillegas
Date: Thu May 12 16:08:42 2022
New Revision: 1900840
URL: http://svn.apache.org/viewvc?rev=1900840&view=rev
Log:
DERBY-7138: Remove references to more java.security classes; commit derby-7138-19-aa-privilegedActions.diff.
Modified:
db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java
db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java
db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java
db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java
db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java
Modified: db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.client/org/apache/derby/client/net/OpenSocketAction.java Thu May 12 16:08:42 2022
@@ -29,7 +29,6 @@ import java.security.KeyManagementExcept
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
-import java.security.PrivilegedExceptionAction;
import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.util.Properties;
Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/error/StandardException.java Thu May 12 16:08:42 2022
@@ -22,7 +22,6 @@
package org.apache.derby.shared.common.error;
import java.lang.reflect.InvocationTargetException;
-import java.security.PrivilegedActionException;
import java.sql.SQLException;
import java.sql.SQLWarning;
@@ -404,10 +403,8 @@ public class StandardException extends E
*/
private static boolean isVacuousWrapper(Throwable t) {
// The only interesting information in an InvocationTargetException
- // or a PrivilegedActionException is the cause, so consider them
- // vacuous if they have a cause.
- if (t instanceof InvocationTargetException
- || t instanceof PrivilegedActionException) {
+ // is its cause.
+ if (t instanceof InvocationTargetException) {
return (t.getCause() != null);
}
Modified: db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.commons/org/apache/derby/shared/common/info/ProductVersionHolder.java Thu May 12 16:08:42 2022
@@ -112,7 +112,7 @@ import org.apache.derby.shared.common.re
</PRE>
*/
-public final class ProductVersionHolder implements java.security.PrivilegedAction<Properties>
+public final class ProductVersionHolder
{
//
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/jdbc/InternalDriver.java Thu May 12 16:08:42 2022
@@ -22,7 +22,6 @@
package org.apache.derby.iapi.jdbc;
import java.security.Permission;
-import java.security.PrivilegedAction;
import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/jdbc/authentication/NativeAuthenticationServiceImpl.java Thu May 12 16:08:42 2022
@@ -24,7 +24,6 @@ package org.apache.derby.impl.jdbc.authe
import java.util.Properties;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.security.PrivilegedAction;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.SQLWarning;
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/jce/JCECipherFactory.java Thu May 12 16:08:42 2022
@@ -33,7 +33,6 @@ import org.apache.derby.iapi.util.String
import java.util.Properties;
import java.util.Enumeration;
-import java.security.PrivilegedExceptionAction;
import java.security.Provider;
import java.security.SecureRandom;
import java.security.Security;
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/monitor/StorageFactoryService.java Thu May 12 16:08:42 2022
@@ -989,7 +989,6 @@ final class StorageFactoryService implem
return contents[index++];
} // end of nextElement
- // PrivilegedAction method
public final DirectoryList run()
{
switch( actionCode)
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java Thu May 12 16:08:42 2022
@@ -29,7 +29,6 @@ import org.apache.derby.iapi.util.ByteAr
*/
public class ReflectClassesJava2 extends DatabaseClasses
- implements java.security.PrivilegedAction<Object>
{
private java.util.HashMap<String,ReflectGeneratedClass> preCompiled;
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java Thu May 12 16:08:42 2022
@@ -76,7 +76,6 @@ import java.io.OutputStreamWriter;
import java.net.MalformedURLException;
import java.net.URL;
-import java.security.PrivilegedExceptionAction;
import java.security.SecureRandom;
import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
@@ -92,8 +91,8 @@ import org.apache.derby.iapi.store.repli
</PRE>
<P>
- Class is final as it has methods with privilege blocks
- and implements PrivilegedExceptionAction.
+ Class is final because it used to have methods with privilege blocks.
+ See DERBY-7138.
*/
public final class RawStore implements RawStoreFactory, ModuleControl, ModuleSupportable
@@ -2686,7 +2685,6 @@ public final class RawStore implements R
}
- // PrivilegedExceptionAction method
public final Object run() throws IOException, StandardException
{
switch(actionCode)
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Thu May 12 16:08:42 2022
@@ -198,7 +198,7 @@ public class BaseDataFileFactory
private Hashtable<String,StorageFile> postRecoveryRemovedFiles;
- // PrivilegedAction actions
+ // actions
private int actionCode;
private static final int REMOVE_TEMP_DIRECTORY_ACTION = 2;
private static final int GET_CONTAINER_PATH_ACTION = 3;
@@ -2737,7 +2737,6 @@ public class BaseDataFileFactory
return storageFactory;
}
- // PrivilegedExceptionAction method
public final Object run() throws IOException, StandardException
{
switch( actionCode)
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java Thu May 12 16:08:42 2022
@@ -395,7 +395,6 @@ public class EncryptOrDecryptData {
- // PrivilegedAction method
public Boolean run()
{
switch(actionCode)
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java Thu May 12 16:08:42 2022
@@ -1316,7 +1316,6 @@ class RAFContainer extends FileContainer
- // PrivilegedExceptionAction method
public Object run() throws StandardException
{
switch( actionCode)
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java Thu May 12 16:08:42 2022
@@ -1147,7 +1147,6 @@ class StreamFileContainer implements Typ
}
- // PrivilegedAction method
public Object run() throws IOException
{
switch(actionCode)
Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java Thu May 12 16:08:42 2022
@@ -198,8 +198,8 @@ import java.util.zip.CRC32;
<P>Multithreading considerations:<BR>
Log Factory must be MT-safe.
<P>
- Class is final as it has methods with privilege blocks
- and implements PrivilegedExceptionAction.
+ Class is final because it used to have methods with privilege blocks.
+ See DERBY-7138.
*/
public final class LogToFile implements LogFactory, ModuleControl, ModuleSupportable,
Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java Thu May 12 16:08:42 2022
@@ -27,7 +27,6 @@ import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.URL;
import java.security.CodeSource;
-import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.Properties;
import org.apache.derby.shared.common.reference.Property;
Modified: db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/ij/util.java Thu May 12 16:08:42 2022
@@ -54,7 +54,7 @@ import javax.sql.DataSource;
@see org.apache.derby.tools.JDBCDisplayUtil
*/
-public final class util implements java.security.PrivilegedAction<String> {
+public final class util {
private util() {}
Modified: db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=1900840&r1=1900839&r2=1900840&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tools/org/apache/derby/impl/tools/sysinfo/Main.java Thu May 12 16:08:42 2022
@@ -44,8 +44,6 @@ import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLDecoder;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import java.security.ProtectionDomain;
import java.security.CodeSource;