Author: allee8285
Date: Fri Nov 26 15:27:56 2010
New Revision: 1039414
URL: http://svn.apache.org/viewvc?rev=1039414&view=rev
Log:
OPENJPA-1895 add doPriv to setAccessible call.
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=1039414&r1=1039413&r2=1039414&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
Fri Nov 26 15:27:56 2010
@@ -19,6 +19,7 @@
package org.apache.openjpa.jdbc.kernel;
import java.lang.reflect.Constructor;
+import java.security.AccessController;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -36,7 +37,6 @@ import java.util.Set;
import javax.sql.DataSource;
-import org.apache.commons.lang.StringUtils;
import org.apache.openjpa.datacache.QueryCache;
import org.apache.openjpa.datacache.QueryCacheStoreQuery;
import org.apache.openjpa.enhance.PersistenceCapable;
@@ -47,7 +47,6 @@ import org.apache.openjpa.jdbc.meta.Disc
import org.apache.openjpa.jdbc.meta.FieldMapping;
import org.apache.openjpa.jdbc.meta.ValueMapping;
import org.apache.openjpa.jdbc.meta.strats.SuperclassDiscriminatorStrategy;
-import org.apache.openjpa.jdbc.schema.DataSourceFactory;
import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
import org.apache.openjpa.jdbc.sql.Joins;
@@ -76,6 +75,7 @@ import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.rop.MergedResultObjectProvider;
import org.apache.openjpa.lib.rop.ResultObjectProvider;
import org.apache.openjpa.lib.util.ConcreteClassGenerator;
+import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.ClassMetaData;
import org.apache.openjpa.meta.FieldMetaData;
@@ -125,16 +125,16 @@ public class JDBCStoreManager
try {
clientConnectionImpl =
ConcreteClassGenerator.getConcreteConstructor(ClientConnection.class,
Connection.class);
- clientConnectionImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(clientConnectionImpl,
true));
refCountConnectionImpl =
ConcreteClassGenerator.getConcreteConstructor(RefCountConnection.class,
JDBCStoreManager.class, Connection.class);
- refCountConnectionImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(refCountConnectionImpl,
true));
cancelStatementImpl =
ConcreteClassGenerator.getConcreteConstructor(CancelStatement.class,
JDBCStoreManager.class, Statement.class, Connection.class);
- cancelStatementImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(cancelStatementImpl,
true));
cancelPreparedStatementImpl =
ConcreteClassGenerator.getConcreteConstructor(CancelPreparedStatement.class,
JDBCStoreManager.class, PreparedStatement.class,
Connection.class);
- cancelPreparedStatementImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(cancelPreparedStatementImpl,
true));
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java?rev=1039414&r1=1039413&r2=1039414&view=diff
==============================================================================
---
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
(original)
+++
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
Fri Nov 26 15:27:56 2010
@@ -23,6 +23,7 @@ import java.io.Reader;
import java.lang.reflect.Constructor;
import java.math.BigDecimal;
import java.net.URL;
+import java.security.AccessController;
import java.sql.Array;
import java.sql.Blob;
import java.sql.Clob;
@@ -44,6 +45,7 @@ import java.util.Calendar;
import org.apache.openjpa.lib.util.Closeable;
import org.apache.openjpa.lib.util.ConcreteClassGenerator;
+import org.apache.openjpa.lib.util.J2DoPrivHelper;
/**
* Wrapper around an existing statement. Subclasses can override the
@@ -61,7 +63,7 @@ public abstract class DelegatingPrepared
try {
concreteImpl =
ConcreteClassGenerator.getConcreteConstructor(DelegatingPreparedStatement.class,
PreparedStatement.class, Connection.class);
- concreteImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(concreteImpl,
true));
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
Modified:
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java?rev=1039414&r1=1039413&r2=1039414&view=diff
==============================================================================
---
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
(original)
+++
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
Fri Nov 26 15:27:56 2010
@@ -23,6 +23,7 @@ import java.io.Reader;
import java.lang.reflect.Constructor;
import java.math.BigDecimal;
import java.net.URL;
+import java.security.AccessController;
import java.sql.Array;
import java.sql.BatchUpdateException;
import java.sql.Blob;
@@ -99,27 +100,27 @@ public class LoggingConnectionDecorator
try {
loggingConnectionImpl =
ConcreteClassGenerator.getConcreteConstructor(LoggingConnection.class,
LoggingConnectionDecorator.class, Connection.class);
- loggingConnectionImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(loggingConnectionImpl,
true));
loggingResultSetImpl =
ConcreteClassGenerator.getConcreteConstructor(
LoggingConnection.LoggingResultSet.class,
LoggingConnection.class, ResultSet.class, Statement.class);
- loggingResultSetImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(loggingResultSetImpl,
true));
loggingStatementImpl =
ConcreteClassGenerator.getConcreteConstructor(
LoggingConnection.LoggingStatement.class,
LoggingConnection.class, Statement.class);
- loggingStatementImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(loggingStatementImpl,
true));
loggingPreparedStatementImpl =
ConcreteClassGenerator.getConcreteConstructor(
LoggingConnection.LoggingPreparedStatement.class,
LoggingConnection.class, PreparedStatement.class,
String.class);
- loggingPreparedStatementImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(loggingPreparedStatementImpl,
true));
loggingCallableStatementImpl =
ConcreteClassGenerator.getConcreteConstructor(
LoggingConnection.LoggingCallableStatement.class,
LoggingConnection.class, CallableStatement.class,
String.class);
- loggingCallableStatementImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(loggingCallableStatementImpl,
true));
loggingDatabaseMetaDataImpl =
ConcreteClassGenerator.getConcreteConstructor(
LoggingConnection.LoggingDatabaseMetaData.class,
LoggingConnection.class, DatabaseMetaData.class);
- loggingDatabaseMetaDataImpl.setAccessible(true);
+
AccessController.doPrivileged(J2DoPrivHelper.setAccessibleAction(loggingDatabaseMetaDataImpl,
true));
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
@@ -1273,7 +1274,7 @@ public class LoggingConnectionDecorator
// set the current params to the saved values
if (indexOfFirstFailedObject < _paramBatch.size())
- _params = (List)
_paramBatch.get(indexOfFirstFailedObject);
+ _params = (List<String>)
_paramBatch.get(indexOfFirstFailedObject);
}
}
err = wrap(se, LoggingPreparedStatement.this,
indexOfFirstFailedObject);
