[jboss-cvs] JBossAS SVN: r110507 - in projects/jboss-jca/trunk: adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7 and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 1 12:14:31 EST 2011
Author: jesper.pedersen
Date: 2011-02-01 12:14:31 -0500 (Tue, 01 Feb 2011)
New Revision: 110507
Added:
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForSpyTestCase.java
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml
Modified:
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedCallableStatement.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedPreparedStatement.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedResultSet.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedStatement.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedCallableStatementJDK7.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedConnectionJDK7.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedPreparedStatementJDK7.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedResultSetJDK7.java
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedStatementJDK7.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/trunk/doc/userguide/en-US/modules/schemas.xml
Log:
[JBJCA-482] Add spy functionality to JDBC resource adapter (Part 2)
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/BaseWrapperManagedConnection.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -56,6 +56,7 @@
* @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
* @author <a href="mailto:weston.price at jboss.com">Weston Price</a>
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
* @version $Revision: 105425 $
*/
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedCallableStatement.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedCallableStatement.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedCallableStatement.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -85,9 +85,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getObject(parameterIndex);
@@ -106,9 +106,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, typeMap);
return cs.getObject(parameterIndex, typeMap);
@@ -127,9 +127,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getObject(parameterName);
@@ -148,9 +148,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, typeMap);
return cs.getObject(parameterName, typeMap);
@@ -169,9 +169,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBoolean(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getBoolean(parameterIndex);
@@ -190,9 +190,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBoolean(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getBoolean(parameterName);
@@ -211,9 +211,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getByte(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getByte(parameterIndex);
@@ -232,9 +232,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getByte(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getByte(parameterName);
@@ -253,9 +253,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getShort(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getShort(parameterIndex);
@@ -274,9 +274,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getShort(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getShort(parameterName);
@@ -295,9 +295,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getInt(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getInt(parameterIndex);
@@ -316,9 +316,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getInt(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getInt(parameterName);
@@ -337,9 +337,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getLong(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getLong(parameterIndex);
@@ -358,9 +358,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getLong(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getLong(parameterName);
@@ -379,9 +379,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFloat(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getFloat(parameterIndex);
@@ -400,9 +400,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFloat(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getFloat(parameterName);
@@ -421,9 +421,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDouble(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getDouble(parameterIndex);
@@ -442,9 +442,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDouble(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getDouble(parameterName);
@@ -463,9 +463,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBytes(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getBytes(parameterIndex);
@@ -484,9 +484,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBytes(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getBytes(parameterName);
@@ -505,9 +505,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getURL(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getURL(parameterIndex);
@@ -526,9 +526,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getURL(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getURL(parameterName);
@@ -547,9 +547,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getString(parameterIndex);
@@ -568,9 +568,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getString(parameterName);
@@ -589,9 +589,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRef(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getRef(parameterIndex);
@@ -610,9 +610,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRef(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getRef(parameterName);
@@ -631,9 +631,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getTime(parameterIndex);
@@ -652,9 +652,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, calendar);
return cs.getTime(parameterIndex, calendar);
@@ -673,9 +673,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getTime(parameterName);
@@ -694,9 +694,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, calendar);
return cs.getTime(parameterName, calendar);
@@ -715,9 +715,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getDate(parameterIndex);
@@ -736,9 +736,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, calendar);
return cs.getDate(parameterIndex, calendar);
@@ -757,9 +757,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getDate(parameterName);
@@ -778,9 +778,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, calendar);
return cs.getDate(parameterName, calendar);
@@ -799,9 +799,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] registerOutParameter(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, sqlType);
cs.registerOutParameter(parameterIndex, sqlType);
@@ -820,9 +820,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] registerOutParameter(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, sqlType, scale);
cs.registerOutParameter(parameterIndex, sqlType, scale);
@@ -841,9 +841,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] registerOutParameter(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, sqlType, typeName);
cs.registerOutParameter(parameterIndex, sqlType, typeName);
@@ -862,9 +862,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] registerOutParameter(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, sqlType);
cs.registerOutParameter(parameterName, sqlType);
@@ -883,9 +883,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] registerOutParameter(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, sqlType, scale);
cs.registerOutParameter(parameterName, sqlType, scale);
@@ -904,9 +904,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] registerOutParameter(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, sqlType, typeName);
cs.registerOutParameter(parameterName, sqlType, typeName);
@@ -925,9 +925,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] wasNull()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
return cs.wasNull();
}
@@ -946,9 +946,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, scale);
return cs.getBigDecimal(parameterIndex, scale);
@@ -967,9 +967,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getBigDecimal(parameterIndex);
@@ -988,9 +988,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getBigDecimal(parameterName);
@@ -1009,9 +1009,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getTimestamp(parameterIndex);
@@ -1030,9 +1030,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, calendar);
return cs.getTimestamp(parameterIndex, calendar);
@@ -1051,9 +1051,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getTimestamp(parameterName);
@@ -1072,9 +1072,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, calendar);
return cs.getTimestamp(parameterName, calendar);
@@ -1093,9 +1093,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBlob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getBlob(parameterIndex);
@@ -1114,9 +1114,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBlob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getBlob(parameterName);
@@ -1135,9 +1135,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getClob(parameterIndex);
@@ -1156,9 +1156,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getClob(parameterName);
@@ -1177,9 +1177,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getArray(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return cs.getArray(parameterIndex);
@@ -1198,9 +1198,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getArray(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return cs.getArray(parameterName);
@@ -1218,9 +1218,9 @@
{
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isClosed()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
PreparedStatement wrapped = getWrappedObject();
if (wrapped == null)
@@ -1241,9 +1241,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isPoolable()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
return statement.isPoolable();
}
@@ -1261,9 +1261,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setPoolable(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
poolable);
statement.setPoolable(poolable);
@@ -1282,9 +1282,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBoolean(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setBoolean(parameterName, value);
@@ -1303,9 +1303,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setByte(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setByte(parameterName, value);
@@ -1324,9 +1324,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setShort(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setShort(parameterName, value);
@@ -1345,9 +1345,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setInt(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setInt(parameterName, value);
@@ -1366,9 +1366,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setLong(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setLong(parameterName, value);
@@ -1387,9 +1387,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setFloat(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setFloat(parameterName, value);
@@ -1408,9 +1408,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setDouble(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setDouble(parameterName, value);
@@ -1429,9 +1429,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setURL(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setURL(parameterName, value);
@@ -1450,9 +1450,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setTime(parameterName, value);
@@ -1471,9 +1471,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTime(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value, calendar);
cs.setTime(parameterName, value, calendar);
@@ -1492,9 +1492,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNull(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setNull(parameterName, value);
@@ -1513,9 +1513,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNull(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, sqlType, typeName);
cs.setNull(parameterName, sqlType, typeName);
@@ -1534,9 +1534,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setBigDecimal(parameterName, value);
@@ -1555,9 +1555,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setString(parameterName, value);
@@ -1576,9 +1576,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBytes(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, Arrays.toString(value));
cs.setBytes(parameterName, value);
@@ -1597,9 +1597,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setDate(parameterName, value);
@@ -1618,9 +1618,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setDate(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value, calendar);
cs.setDate(parameterName, value, calendar);
@@ -1639,9 +1639,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setTimestamp(parameterName, value);
@@ -1660,9 +1660,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTimestamp(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value, calendar);
cs.setTimestamp(parameterName, value, calendar);
@@ -1681,9 +1681,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, stream, length);
cs.setAsciiStream(parameterName, stream, length);
@@ -1702,9 +1702,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, stream, length);
cs.setBinaryStream(parameterName, stream, length);
@@ -1723,9 +1723,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setObject(%s, %s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value, sqlType, scale);
cs.setObject(parameterName, value, sqlType, scale);
@@ -1744,9 +1744,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setObject(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value, sqlType);
cs.setObject(parameterName, value, sqlType);
@@ -1765,9 +1765,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
cs.setObject(parameterName, value);
@@ -1786,9 +1786,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader, length);
cs.setCharacterStream(parameterName, reader, length);
@@ -1807,9 +1807,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, x, length);
statement.setAsciiStream(parameterIndex, x, length);
@@ -1828,9 +1828,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, x);
statement.setAsciiStream(parameterIndex, x);
@@ -1849,9 +1849,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, x, length);
statement.setBinaryStream(parameterIndex, x, length);
@@ -1870,9 +1870,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, x);
statement.setBinaryStream(parameterIndex, x);
@@ -1891,9 +1891,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, inputStream, length);
statement.setBlob(parameterIndex, inputStream, length);
@@ -1912,9 +1912,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, inputStream);
statement.setBlob(parameterIndex, inputStream);
@@ -1933,9 +1933,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, reader, length);
statement.setCharacterStream(parameterIndex, reader, length);
@@ -1954,9 +1954,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, reader);
statement.setCharacterStream(parameterIndex, reader);
@@ -1975,9 +1975,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, reader, length);
statement.setClob(parameterIndex, reader, length);
@@ -1996,9 +1996,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, reader);
statement.setClob(parameterIndex, reader);
@@ -2017,9 +2017,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, value, length);
statement.setNCharacterStream(parameterIndex, value, length);
@@ -2038,9 +2038,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, value);
statement.setNCharacterStream(parameterIndex, value);
@@ -2059,9 +2059,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, value);
statement.setNClob(parameterIndex, value);
@@ -2080,9 +2080,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, reader, length);
statement.setNClob(parameterIndex, reader, length);
@@ -2101,9 +2101,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, reader);
statement.setNClob(parameterIndex, reader);
@@ -2122,9 +2122,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, value);
statement.setNString(parameterIndex, value);
@@ -2143,9 +2143,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setRowId(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, x);
statement.setRowId(parameterIndex, x);
@@ -2164,9 +2164,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setSQLXML(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, xmlObject);
statement.setSQLXML(parameterIndex, xmlObject);
@@ -2185,9 +2185,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return statement.getCharacterStream(parameterIndex);
@@ -2206,9 +2206,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return statement.getCharacterStream(parameterName);
@@ -2227,9 +2227,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return statement.getNCharacterStream(parameterIndex);
@@ -2248,9 +2248,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return statement.getCharacterStream(parameterName);
@@ -2269,9 +2269,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return statement.getNClob(parameterIndex);
@@ -2290,9 +2290,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return statement.getNClob(parameterName);
@@ -2311,9 +2311,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return statement.getNString(parameterIndex);
@@ -2332,9 +2332,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return statement.getNString(parameterName);
@@ -2353,9 +2353,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRowId(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return statement.getRowId(parameterIndex);
@@ -2374,9 +2374,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRowId(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return statement.getRowId(parameterName);
@@ -2395,9 +2395,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getSQLXML(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex);
return statement.getSQLXML(parameterIndex);
@@ -2416,9 +2416,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getSQLXML(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName);
return statement.getSQLXML(parameterName);
@@ -2437,9 +2437,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x, length);
statement.setAsciiStream(parameterName, x, length);
@@ -2458,9 +2458,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x);
statement.setAsciiStream(parameterName, x);
@@ -2479,9 +2479,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x, length);
statement.setBinaryStream(parameterName, x, length);
@@ -2500,9 +2500,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x);
statement.setBinaryStream(parameterName, x);
@@ -2521,9 +2521,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x);
statement.setBlob(parameterName, x);
@@ -2542,9 +2542,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, inputStream, length);
statement.setBlob(parameterName, inputStream, length);
@@ -2563,9 +2563,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, inputStream);
statement.setBlob(parameterName, inputStream);
@@ -2584,9 +2584,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader, length);
statement.setCharacterStream(parameterName, reader, length);
@@ -2605,9 +2605,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader);
statement.setCharacterStream(parameterName, reader);
@@ -2626,9 +2626,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x);
statement.setClob(parameterName, x);
@@ -2647,9 +2647,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader, length);
statement.setClob(parameterName, reader, length);
@@ -2668,9 +2668,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader);
statement.setClob(parameterName, reader);
@@ -2689,9 +2689,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value, length);
statement.setNCharacterStream(parameterName, value, length);
@@ -2710,9 +2710,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
statement.setNCharacterStream(parameterName, value);
@@ -2731,9 +2731,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
statement.setNClob(parameterName, value);
@@ -2752,9 +2752,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader, length);
statement.setNClob(parameterName, reader, length);
@@ -2773,9 +2773,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, reader);
statement.setNClob(parameterName, reader);
@@ -2794,9 +2794,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, value);
statement.setNString(parameterName, value);
@@ -2815,9 +2815,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setRowId(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, x);
statement.setRowId(parameterName, x);
@@ -2836,9 +2836,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setSQLXML(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, xmlObject);
statement.setSQLXML(parameterName, xmlObject);
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedConnection.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -74,9 +74,11 @@
private int trackStatements;
- private boolean spy = false;
+ /** Spy functionality */
+ protected boolean spy = false;
- private String jndiName = null;
+ /** The jndi name */
+ protected String jndiName = null;
/**
* Constructor
@@ -104,6 +106,24 @@
}
/**
+ * Set the spy value
+ * @param v The value
+ */
+ void setSpy(boolean v)
+ {
+ this.spy = v;
+ }
+
+ /**
+ * Set the jndi name value
+ * @param v The value
+ */
+ void setJndiName(String v)
+ {
+ this.jndiName = v;
+ }
+
+ /**
* Lock connection
* @exception SQLException Thrown if an error occurs
*/
@@ -156,42 +176,6 @@
}
/**
- * Get the spy value
- * @return The value
- */
- public boolean isSpy()
- {
- return spy;
- }
-
- /**
- * Set the spy value
- * @param v The value
- */
- protected void setSpy(boolean v)
- {
- this.spy = v;
- }
-
- /**
- * Get the jndi name value
- * @return The value
- */
- public String getJndiName()
- {
- return jndiName;
- }
-
- /**
- * Set the jndi name value
- * @param v The value
- */
- protected void setJndiName(String v)
- {
- this.jndiName = v;
- }
-
- /**
* {@inheritDoc}
*/
public void setReadOnly(boolean readOnly) throws SQLException
@@ -201,9 +185,9 @@
{
checkStatus();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setReadOnly(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, readOnly);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, readOnly);
mc.setJdbcReadOnly(readOnly);
}
@@ -220,8 +204,8 @@
{
checkStatus();
- if (isSpy())
- spyLogger.debugf("%s [%s] isReadOnly()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] isReadOnly()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.isJdbcReadOnly();
}
@@ -233,8 +217,8 @@
{
closed = true;
- if (isSpy())
- spyLogger.debugf("%s [%s] close()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] close()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
if (mc != null)
{
@@ -277,8 +261,8 @@
*/
public boolean isClosed() throws SQLException
{
- if (isSpy())
- spyLogger.debugf("%s [%s] isClosed()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] isClosed()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return closed;
}
@@ -303,10 +287,10 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] createStatement()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] createStatement()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
- return wrapStatement(mc.getConnection().createStatement(), isSpy(), getJndiName());
+ return wrapStatement(mc.getConnection().createStatement(), spy, jndiName);
}
catch (Throwable t)
{
@@ -330,13 +314,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createStatement(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
resultSetType, resultSetConcurrency);
return wrapStatement(mc.getConnection().createStatement(resultSetType, resultSetConcurrency),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -361,14 +345,14 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createStatement(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
resultSetType, resultSetConcurrency, resultSetHoldability);
return wrapStatement(mc.getConnection()
.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -402,13 +386,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareStatement(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, sql);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, sql);
return wrapPreparedStatement(mc.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -433,13 +417,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareStatement(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, resultSetType, resultSetConcurrency);
return wrapPreparedStatement(mc.prepareStatement(sql, resultSetType, resultSetConcurrency),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -464,15 +448,15 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareStatement(%s, %s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, resultSetType, resultSetConcurrency, resultSetHoldability);
return wrapPreparedStatement(mc.getConnection()
.prepareStatement(sql, resultSetType,
resultSetConcurrency, resultSetHoldability),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -496,13 +480,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareStatement(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, autoGeneratedKeys);
return wrapPreparedStatement(mc.getConnection().prepareStatement(sql, autoGeneratedKeys),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -526,13 +510,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareStatement(%s, %s)"
- , getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ , jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, Arrays.toString(columnIndexes));
return wrapPreparedStatement(mc.getConnection().prepareStatement(sql, columnIndexes),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -556,13 +540,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareStatement(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, Arrays.toString(columnNames));
return wrapPreparedStatement(mc.getConnection().prepareStatement(sql, columnNames),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -596,11 +580,11 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] prepareCall(%s)", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, sql);
+ if (spy)
+ spyLogger.debugf("%s [%s] prepareCall(%s)", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, sql);
return wrapCallableStatement(mc.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -624,13 +608,13 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareCall(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, resultSetType, resultSetConcurrency);
return wrapCallableStatement(mc.prepareCall(sql, resultSetType, resultSetConcurrency),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -655,14 +639,14 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] prepareCall(%s, %s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
sql, resultSetType, resultSetConcurrency, resultSetHoldability);
return wrapCallableStatement(mc.getConnection()
.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability),
- isSpy(), getJndiName());
+ spy, jndiName);
}
catch (Throwable t)
{
@@ -686,9 +670,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] nativeSQL(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, sql);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, sql);
return mc.getConnection().nativeSQL(sql);
}
@@ -713,9 +697,9 @@
{
checkStatus();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAutoCommit(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, autocommit);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, autocommit);
mc.setJdbcAutoCommit(autocommit);
}
@@ -735,8 +719,8 @@
{
checkStatus();
- if (isSpy())
- spyLogger.debugf("%s [%s] getAutoCommit()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] getAutoCommit()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.isJdbcAutoCommit();
}
@@ -756,8 +740,8 @@
{
checkTransaction();
- if (isSpy())
- spyLogger.debugf("%s [%s] commit()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] commit()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
mc.jdbcCommit();
}
@@ -777,8 +761,8 @@
{
checkTransaction();
- if (isSpy())
- spyLogger.debugf("%s [%s] rollback()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] rollback()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
mc.jdbcRollback();
}
@@ -798,9 +782,9 @@
{
checkTransaction();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] rollback(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, savepoint);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, savepoint);
mc.jdbcRollback(savepoint);
}
@@ -821,8 +805,8 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getMetaData()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] getMetaData()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getConnection().getMetaData();
}
@@ -848,9 +832,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCatalog(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, catalog);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, catalog);
mc.getConnection().setCatalog(catalog);
}
@@ -876,9 +860,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getCatalog()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getConnection().getCatalog();
}
@@ -903,9 +887,9 @@
{
checkStatus();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTransactionIsolation(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, isolationLevel);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, isolationLevel);
mc.setJdbcTransactionIsolation(isolationLevel);
}
@@ -925,9 +909,9 @@
{
checkStatus();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTransactionIsolation()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getJdbcTransactionIsolation();
}
@@ -948,9 +932,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getWarnings()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getConnection().getWarnings();
}
@@ -976,8 +960,8 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] clearWarnings()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] clearWarnings()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
mc.getConnection().clearWarnings();
}
@@ -1004,8 +988,8 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getTypeMap()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] getTypeMap()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getConnection().getTypeMap();
}
@@ -1032,9 +1016,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTypeMap(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, typeMap);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, typeMap);
mc.getConnection().setTypeMap(typeMap);
}
@@ -1060,9 +1044,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setHoldability(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, holdability);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, holdability);
mc.getConnection().setHoldability(holdability);
}
@@ -1088,8 +1072,8 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getHoldability()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] getHoldability()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getConnection().getHoldability();
}
@@ -1115,8 +1099,8 @@
checkTransaction();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] setSavepoint()", getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ if (spy)
+ spyLogger.debugf("%s [%s] setSavepoint()", jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return mc.getConnection().setSavepoint();
}
@@ -1142,9 +1126,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setSavepoint(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, name);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, name);
return mc.getConnection().setSavepoint(name);
}
@@ -1170,9 +1154,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] releaseSavepoint(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION, savepoint);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION, savepoint);
mc.getConnection().releaseSavepoint(savepoint);
}
@@ -1199,9 +1183,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createArrayOf(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
typeName, Arrays.toString(elements));
return c.createArrayOf(typeName, elements);
@@ -1228,9 +1212,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createBlob()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.createBlob();
}
@@ -1256,9 +1240,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createClob()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.createClob();
}
@@ -1284,9 +1268,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createNClob()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.createNClob();
}
@@ -1312,9 +1296,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createSQLXML()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.createSQLXML();
}
@@ -1340,9 +1324,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] createStruct(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
typeName, Arrays.toString(attributes));
return c.createStruct(typeName, attributes);
@@ -1369,9 +1353,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getClientInfo()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.getClientInfo();
}
@@ -1397,9 +1381,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getClientInfo(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
name);
return c.getClientInfo(name);
@@ -1426,9 +1410,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isValid(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
timeout);
return c.isValid(timeout);
@@ -1457,9 +1441,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClientInfo(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
properties);
c.setClientInfo(properties);
@@ -1505,9 +1489,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClientInfo(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
name, value);
c.setClientInfo(name, value);
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedPreparedStatement.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedPreparedStatement.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedPreparedStatement.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -105,9 +105,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBoolean(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setBoolean(parameterIndex, value);
@@ -134,9 +134,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setByte(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setByte(parameterIndex, value);
@@ -163,9 +163,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setShort(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setShort(parameterIndex, value);
@@ -192,9 +192,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setInt(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setInt(parameterIndex, value);
@@ -221,9 +221,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setLong(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setLong(parameterIndex, value);
@@ -250,9 +250,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setFloat(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setFloat(parameterIndex, value);
@@ -279,9 +279,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setDouble(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setDouble(parameterIndex, value);
@@ -308,9 +308,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setURL(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setURL(parameterIndex, value);
@@ -337,9 +337,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setTime(parameterIndex, value);
@@ -366,9 +366,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTime(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value, calendar);
ps.setTime(parameterIndex, value, calendar);
@@ -397,9 +397,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] execute()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
return ps.execute();
}
@@ -425,9 +425,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getMetaData()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
return ps.getMetaData();
}
@@ -455,9 +455,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeQuery()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
ResultSet resultSet = ps.executeQuery();
return registerResultSet(resultSet);
@@ -486,9 +486,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeUpdate()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
return ps.executeUpdate();
}
@@ -514,9 +514,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] addBatch()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
ps.addBatch();
}
@@ -542,9 +542,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNull(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, sqlType);
ps.setNull(parameterIndex, sqlType);
@@ -571,9 +571,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNull(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, sqlType, typeName);
ps.setNull(parameterIndex, sqlType, typeName);
@@ -600,9 +600,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setBigDecimal(parameterIndex, value);
@@ -629,9 +629,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setString(parameterIndex, value);
@@ -658,9 +658,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBytes(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, Arrays.toString(value));
ps.setBytes(parameterIndex, value);
@@ -687,9 +687,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setDate(parameterIndex, value);
@@ -716,9 +716,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setDate(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value, calendar);
ps.setDate(parameterIndex, value, calendar);
@@ -745,9 +745,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setTimestamp(parameterIndex, value);
@@ -774,9 +774,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setTimestamp(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value, calendar);
ps.setTimestamp(parameterIndex, value, calendar);
@@ -804,9 +804,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, stream, length);
ps.setAsciiStream(parameterIndex, stream, length);
@@ -834,9 +834,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setUnicodeStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, stream, length);
ps.setUnicodeStream(parameterIndex, stream, length);
@@ -863,9 +863,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, stream, length);
ps.setBinaryStream(parameterIndex, stream, length);
@@ -892,9 +892,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] clearParameters()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
ps.clearParameters();
}
@@ -920,9 +920,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setObject(%s, %s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value, sqlType, scale);
ps.setObject(parameterIndex, value, sqlType, scale);
@@ -949,9 +949,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setObject(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value, sqlType);
ps.setObject(parameterIndex, value, sqlType);
@@ -978,9 +978,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setObject(parameterIndex, value);
@@ -1007,9 +1007,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader, length);
ps.setCharacterStream(parameterIndex, reader, length);
@@ -1036,9 +1036,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setRef(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setRef(parameterIndex, value);
@@ -1065,9 +1065,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setBlob(parameterIndex, value);
@@ -1094,9 +1094,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setClob(parameterIndex, value);
@@ -1123,9 +1123,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setArray(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
ps.setArray(parameterIndex, value);
@@ -1152,9 +1152,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getParameterMetaData()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
return ps.getParameterMetaData();
}
@@ -1178,9 +1178,9 @@
lock();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isClosed()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
PreparedStatement wrapped = getWrappedObject();
if (wrapped == null)
@@ -1208,9 +1208,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isPoolable()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
return statement.isPoolable();
}
@@ -1236,9 +1236,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setPoolable(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
poolable);
statement.setPoolable(poolable);
@@ -1265,9 +1265,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, x, length);
statement.setAsciiStream(parameterIndex, x, length);
@@ -1294,9 +1294,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setAsciiStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, x);
statement.setAsciiStream(parameterIndex, x);
@@ -1323,9 +1323,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, x, length);
statement.setBinaryStream(parameterIndex, x, length);
@@ -1352,9 +1352,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBinaryStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, x);
statement.setBinaryStream(parameterIndex, x);
@@ -1381,9 +1381,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, inputStream, length);
statement.setBlob(parameterIndex, inputStream, length);
@@ -1410,9 +1410,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, inputStream);
statement.setBlob(parameterIndex, inputStream);
@@ -1439,9 +1439,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader, length);
statement.setCharacterStream(parameterIndex, reader, length);
@@ -1468,9 +1468,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader);
statement.setCharacterStream(parameterIndex, reader);
@@ -1497,9 +1497,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader, length);
statement.setClob(parameterIndex, reader, length);
@@ -1526,9 +1526,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader);
statement.setClob(parameterIndex, reader);
@@ -1555,9 +1555,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value, length);
statement.setNCharacterStream(parameterIndex, value, length);
@@ -1584,9 +1584,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
statement.setNCharacterStream(parameterIndex, value);
@@ -1613,9 +1613,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
statement.setNClob(parameterIndex, value);
@@ -1642,9 +1642,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader, length);
statement.setNClob(parameterIndex, reader, length);
@@ -1671,9 +1671,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, reader);
statement.setNClob(parameterIndex, reader);
@@ -1700,9 +1700,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, value);
statement.setNString(parameterIndex, value);
@@ -1729,9 +1729,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setRowId(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, x);
statement.setRowId(parameterIndex, x);
@@ -1758,9 +1758,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setSQLXML(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT,
parameterIndex, xmlObject);
statement.setSQLXML(parameterIndex, xmlObject);
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedResultSet.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedResultSet.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedResultSet.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -70,10 +70,10 @@
private AtomicBoolean closed = new AtomicBoolean(false);
/** Spy functionality */
- private boolean spy;
+ protected final boolean spy;
/** The jndi name */
- private String jndiName;
+ protected final String jndiName;
/**
* Create a new wrapped result set
@@ -84,7 +84,7 @@
* @param jndiName The jndi name
*/
public WrappedResultSet(WrappedStatement statement, ResultSet resultSet,
- boolean spy, String jndiName)
+ final boolean spy, final String jndiName)
{
if (statement == null)
throw new IllegalArgumentException("Null statement!");
@@ -99,24 +99,6 @@
}
/**
- * Get the spy value
- * @return The value
- */
- public boolean isSpy()
- {
- return spy;
- }
-
- /**
- * Get the jndi name value
- * @return The value
- */
- public String getJndiName()
- {
- return jndiName;
- }
-
- /**
* {@inheritDoc}
*/
public ResultSet getUnderlyingResultSet() throws SQLException
@@ -141,9 +123,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] absolute(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
row);
return resultSet.absolute(row);
@@ -162,9 +144,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] afterLast()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.afterLast();
}
@@ -182,9 +164,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] beforeFirst()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.beforeFirst();
}
@@ -202,9 +184,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] cancelRowUpdates()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.cancelRowUpdates();
}
@@ -222,9 +204,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] clearWarnings()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.clearWarnings();
}
@@ -242,9 +224,9 @@
if (closed.get())
return;
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] close()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
closed.set(true);
statement.unregisterResultSet(this);
@@ -262,9 +244,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] deleteRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.deleteRow();
}
@@ -287,9 +269,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] findColumn(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.findColumn(columnName);
@@ -308,9 +290,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] first()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.first();
}
@@ -328,9 +310,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getArray(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
i);
return resultSet.getArray(i);
@@ -349,9 +331,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getArray(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
colName);
return resultSet.getArray(colName);
@@ -370,9 +352,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getAsciiStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getAsciiStream(columnIndex);
@@ -391,9 +373,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getAsciiStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getAsciiStream(columnName);
@@ -412,9 +394,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getBigDecimal(columnIndex);
@@ -434,9 +416,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, scale);
return resultSet.getBigDecimal(columnIndex, scale);
@@ -455,9 +437,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getBigDecimal(columnName);
@@ -477,9 +459,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, scale);
return resultSet.getBigDecimal(columnName, scale);
@@ -498,9 +480,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBinaryStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getBinaryStream(columnIndex);
@@ -519,9 +501,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBinaryStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getBinaryStream(columnName);
@@ -540,9 +522,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBlob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
i);
return resultSet.getBlob(i);
@@ -561,9 +543,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBlob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
colName);
return resultSet.getBlob(colName);
@@ -582,9 +564,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBoolean(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getBoolean(columnIndex);
@@ -603,9 +585,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBoolean(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getBoolean(columnName);
@@ -624,9 +606,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getByte(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getByte(columnIndex);
@@ -645,9 +627,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getByte(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getByte(columnName);
@@ -666,9 +648,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBytes(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getBytes(columnIndex);
@@ -687,9 +669,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getBytes(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getBytes(columnName);
@@ -708,9 +690,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getCharacterStream(columnIndex);
@@ -729,9 +711,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getCharacterStream(columnName);
@@ -750,9 +732,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
i);
return resultSet.getClob(i);
@@ -771,9 +753,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
colName);
return resultSet.getClob(colName);
@@ -792,9 +774,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getConcurrency()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getConcurrency();
}
@@ -812,9 +794,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getCursorName()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getCursorName();
}
@@ -832,9 +814,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getDate(columnIndex);
@@ -853,9 +835,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, cal);
return resultSet.getDate(columnIndex, cal);
@@ -874,9 +856,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getDate(columnName);
@@ -895,9 +877,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, cal);
return resultSet.getDate(columnName, cal);
@@ -916,9 +898,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDouble(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getDouble(columnIndex);
@@ -937,9 +919,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getDouble(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getDouble(columnName);
@@ -958,9 +940,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFetchDirection()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getFetchDirection();
}
@@ -978,9 +960,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFetchSize()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getFetchSize();
}
@@ -998,9 +980,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFloat(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getFloat(columnIndex);
@@ -1019,9 +1001,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFloat(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getFloat(columnName);
@@ -1040,9 +1022,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getInt(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getInt(columnIndex);
@@ -1061,9 +1043,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getInt(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getInt(columnName);
@@ -1082,9 +1064,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getLong(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getLong(columnIndex);
@@ -1103,9 +1085,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getLong(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getLong(columnName);
@@ -1124,9 +1106,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getMetaData()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getMetaData();
}
@@ -1144,9 +1126,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getObject(columnIndex);
@@ -1166,9 +1148,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
i, map);
return resultSet.getObject(i, map);
@@ -1187,9 +1169,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getObject(columnName);
@@ -1209,9 +1191,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
colName, map);
return resultSet.getObject(colName, map);
@@ -1230,9 +1212,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRef(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
i);
return resultSet.getRef(i);
@@ -1251,9 +1233,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRef(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
colName);
return resultSet.getRef(colName);
@@ -1272,9 +1254,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getRow();
}
@@ -1292,9 +1274,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getShort(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getShort(columnIndex);
@@ -1313,9 +1295,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getShort(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getShort(columnName);
@@ -1333,9 +1315,9 @@
{
checkState();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getStatement()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return statement;
}
@@ -1348,9 +1330,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getString(columnIndex);
@@ -1369,9 +1351,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getString(columnName);
@@ -1390,9 +1372,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getTime(columnIndex);
@@ -1411,9 +1393,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, cal);
return resultSet.getTime(columnIndex, cal);
@@ -1432,9 +1414,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getTime(columnName);
@@ -1453,9 +1435,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, cal);
return resultSet.getTime(columnName, cal);
@@ -1474,9 +1456,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getTimestamp(columnIndex);
@@ -1495,9 +1477,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, cal);
return resultSet.getTimestamp(columnIndex, cal);
@@ -1516,9 +1498,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getTimestamp(columnName);
@@ -1537,9 +1519,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, cal);
return resultSet.getTimestamp(columnName, cal);
@@ -1558,9 +1540,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getType()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getType();
}
@@ -1579,9 +1561,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getUnicodeStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getUnicodeStream(columnIndex);
@@ -1600,9 +1582,9 @@
{
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getUnicodeStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getUnicodeStream(columnName);
@@ -1621,9 +1603,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getURL(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getURL(columnIndex);
@@ -1642,9 +1624,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getURL(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
return resultSet.getURL(columnName);
@@ -1663,9 +1645,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getWarnings()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getWarnings();
}
@@ -1686,9 +1668,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] insertRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.insertRow();
}
@@ -1711,9 +1693,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isAfterLast()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.isAfterLast();
}
@@ -1731,9 +1713,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isBeforeFirst()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.isBeforeFirst();
}
@@ -1751,9 +1733,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isFirst()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.isFirst();
}
@@ -1771,9 +1753,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isLast()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.isLast();
}
@@ -1791,9 +1773,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] last()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.last();
}
@@ -1811,9 +1793,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] moveToCurrentRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.moveToCurrentRow();
}
@@ -1831,9 +1813,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] moveToInsertRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.moveToInsertRow();
}
@@ -1851,9 +1833,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] next()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.next();
}
@@ -1871,9 +1853,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] previous()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.previous();
}
@@ -1891,9 +1873,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] refreshRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.refreshRow();
}
@@ -1911,9 +1893,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] relative(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
rows);
return resultSet.relative(rows);
@@ -1932,9 +1914,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] rowDeleted()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.rowDeleted();
}
@@ -1952,9 +1934,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] rowInserted()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.rowInserted();
}
@@ -1972,9 +1954,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] rowUpdated()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.rowUpdated();
}
@@ -1992,9 +1974,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setFetchDirection(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
direction);
resultSet.setFetchDirection(direction);
@@ -2013,9 +1995,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setFetchSize(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
rows);
resultSet.setFetchSize(rows);
@@ -2034,9 +2016,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateArray(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateArray(columnIndex, x);
@@ -2055,9 +2037,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateArray(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateArray(columnName, x);
@@ -2076,9 +2058,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateAsciiStream(columnIndex, x, length);
@@ -2097,9 +2079,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x, length);
resultSet.updateAsciiStream(columnName, x, length);
@@ -2118,9 +2100,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateBigDecimal(columnIndex, x);
@@ -2139,9 +2121,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBigDecimal(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateBigDecimal(columnName, x);
@@ -2160,9 +2142,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateBinaryStream(columnIndex, x, length);
@@ -2181,9 +2163,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x, length);
resultSet.updateBinaryStream(columnName, x, length);
@@ -2202,9 +2184,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateBlob(columnIndex, x);
@@ -2223,9 +2205,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateBlob(columnName, x);
@@ -2244,9 +2226,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBoolean(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateBoolean(columnIndex, x);
@@ -2265,9 +2247,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBoolean(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateBoolean(columnName, x);
@@ -2286,9 +2268,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateByte(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateByte(columnIndex, x);
@@ -2307,9 +2289,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateByte(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateByte(columnName, x);
@@ -2328,9 +2310,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBytes(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, Arrays.toString(x));
resultSet.updateBytes(columnIndex, x);
@@ -2349,9 +2331,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBytes(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, Arrays.toString(x));
resultSet.updateBytes(columnName, x);
@@ -2370,9 +2352,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateCharacterStream(columnIndex, x, length);
@@ -2391,9 +2373,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, reader, length);
resultSet.updateCharacterStream(columnName, reader, length);
@@ -2412,9 +2394,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateClob(columnIndex, x);
@@ -2433,9 +2415,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateClob(columnName, x);
@@ -2454,9 +2436,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateDate(columnIndex, x);
@@ -2475,9 +2457,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateDate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateDate(columnName, x);
@@ -2496,9 +2478,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateDouble(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateDouble(columnIndex, x);
@@ -2517,9 +2499,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateDouble(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateDouble(columnName, x);
@@ -2538,9 +2520,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateFloat(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateFloat(columnIndex, x);
@@ -2559,9 +2541,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateFloat(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateFloat(columnName, x);
@@ -2580,9 +2562,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateInt(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateInt(columnIndex, x);
@@ -2601,9 +2583,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateInt(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateInt(columnName, x);
@@ -2622,9 +2604,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateLong(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateLong(columnIndex, x);
@@ -2643,9 +2625,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateLong(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateLong(columnName, x);
@@ -2664,9 +2646,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNull(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
resultSet.updateNull(columnIndex);
@@ -2685,9 +2667,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNull(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName);
resultSet.updateNull(columnName);
@@ -2706,9 +2688,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateObject(columnIndex, x);
@@ -2727,9 +2709,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateObject(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, scale);
resultSet.updateObject(columnIndex, x, scale);
@@ -2748,9 +2730,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateObject(columnName, x);
@@ -2769,9 +2751,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateObject(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x, scale);
resultSet.updateObject(columnName, x, scale);
@@ -2790,9 +2772,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateRef(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateRef(columnIndex, x);
@@ -2811,9 +2793,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateRef(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateRef(columnName, x);
@@ -2835,9 +2817,9 @@
checkTransaction();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateRow()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
resultSet.updateRow();
}
@@ -2876,9 +2858,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateShort(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateShort(columnName, x);
@@ -2897,9 +2879,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateString(columnIndex, x);
@@ -2918,9 +2900,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateString(columnName, x);
@@ -2939,9 +2921,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateTime(columnIndex, x);
@@ -2960,9 +2942,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateTime(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateTime(columnName, x);
@@ -2981,9 +2963,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateTimestamp(columnIndex, x);
@@ -3002,9 +2984,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateTimestamp(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnName, x);
resultSet.updateTimestamp(columnName, x);
@@ -3023,9 +3005,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] wasNull()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.wasNull();
}
@@ -3043,9 +3025,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getHoldability()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
return resultSet.getHoldability();
}
@@ -3063,9 +3045,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getNCharacterStream(columnIndex);
@@ -3084,9 +3066,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNCharacterStream(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel);
return resultSet.getNCharacterStream(columnLabel);
@@ -3105,9 +3087,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getNClob(columnIndex);
@@ -3126,9 +3108,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNClob(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel);
return resultSet.getNClob(columnLabel);
@@ -3147,9 +3129,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getNString(columnIndex);
@@ -3168,9 +3150,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNString(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel);
return resultSet.getNString(columnLabel);
@@ -3189,9 +3171,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRowId(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getRowId(columnIndex);
@@ -3210,9 +3192,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getRowId(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel);
return resultSet.getRowId(columnLabel);
@@ -3231,9 +3213,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getSQLXML(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex);
return resultSet.getSQLXML(columnIndex);
@@ -3252,9 +3234,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getSQLXML(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel);
return resultSet.getSQLXML(columnLabel);
@@ -3270,9 +3252,9 @@
*/
public boolean isClosed() throws SQLException
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isClosed()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET);
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET);
ResultSet resultSet = getWrappedObject();
if (resultSet == null)
@@ -3295,9 +3277,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateAsciiStream(columnIndex, x, length);
@@ -3316,9 +3298,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateAsciiStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateAsciiStream(columnIndex, x);
@@ -3337,9 +3319,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateAsciiStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, x, length);
resultSet.updateAsciiStream(columnLabel, x, length);
@@ -3358,9 +3340,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateAsciiStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, x);
resultSet.updateAsciiStream(columnLabel, x);
@@ -3379,9 +3361,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateBinaryStream(columnIndex, x, length);
@@ -3400,9 +3382,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBinaryStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateBinaryStream(columnIndex, x);
@@ -3421,9 +3403,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBinaryStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, x, length);
resultSet.updateBinaryStream(columnLabel, x, length);
@@ -3442,9 +3424,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBinaryStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, x);
resultSet.updateBinaryStream(columnLabel, x);
@@ -3463,9 +3445,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBlob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, inputStream, length);
resultSet.updateBlob(columnIndex, inputStream, length);
@@ -3484,9 +3466,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, inputStream);
resultSet.updateBlob(columnIndex, inputStream);
@@ -3505,9 +3487,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBlob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, inputStream, length);
resultSet.updateBlob(columnLabel, inputStream, length);
@@ -3526,9 +3508,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateBlob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, inputStream);
resultSet.updateBlob(columnLabel, inputStream);
@@ -3547,9 +3529,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateCharacterStream(columnIndex, x, length);
@@ -3568,9 +3550,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateCharacterStream(columnIndex, x);
@@ -3589,9 +3571,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader, length);
resultSet.updateCharacterStream(columnLabel, reader, length);
@@ -3610,9 +3592,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader);
resultSet.updateCharacterStream(columnLabel, reader);
@@ -3631,9 +3613,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, reader, length);
resultSet.updateClob(columnIndex, reader, length);
@@ -3652,9 +3634,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, reader);
resultSet.updateClob(columnIndex, reader);
@@ -3673,9 +3655,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader, length);
resultSet.updateClob(columnLabel, reader, length);
@@ -3694,9 +3676,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader);
resultSet.updateClob(columnLabel, reader);
@@ -3715,9 +3697,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x, length);
resultSet.updateNCharacterStream(columnIndex, x, length);
@@ -3736,9 +3718,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateNCharacterStream(columnIndex, x);
@@ -3757,9 +3739,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNCharacterStream(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader, length);
resultSet.updateNCharacterStream(columnLabel, reader, length);
@@ -3778,9 +3760,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNCharacterStream(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader);
resultSet.updateNCharacterStream(columnLabel, reader);
@@ -3799,9 +3781,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, clob);
resultSet.updateNClob(columnIndex, clob);
@@ -3820,9 +3802,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, reader, length);
resultSet.updateNClob(columnIndex, reader, length);
@@ -3841,9 +3823,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, reader);
resultSet.updateNClob(columnIndex, reader);
@@ -3862,9 +3844,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, clob);
resultSet.updateNClob(columnLabel, clob);
@@ -3883,9 +3865,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNClob(%s, %s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader, length);
resultSet.updateNClob(columnLabel, reader, length);
@@ -3904,9 +3886,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNClob(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, reader);
resultSet.updateNClob(columnLabel, reader);
@@ -3925,9 +3907,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, string);
resultSet.updateNString(columnIndex, string);
@@ -3946,9 +3928,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateNString(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, string);
resultSet.updateNString(columnLabel, string);
@@ -3967,9 +3949,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateRowId(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, x);
resultSet.updateRowId(columnIndex, x);
@@ -3988,9 +3970,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateRowId(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, x);
resultSet.updateRowId(columnLabel, x);
@@ -4009,9 +3991,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateSQLXML(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnIndex, xmlObject);
resultSet.updateSQLXML(columnIndex, xmlObject);
@@ -4030,9 +4012,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] updateSQLXML(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
columnLabel, xmlObject);
resultSet.updateSQLXML(columnLabel, xmlObject);
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedStatement.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedStatement.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrappedStatement.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -57,10 +57,10 @@
private AtomicBoolean closed = new AtomicBoolean(false);
/** Spy functionality */
- private boolean spy;
+ protected final boolean spy;
/** The jndi name */
- private String jndiName;
+ protected final String jndiName;
/**
* Constructor
@@ -69,12 +69,13 @@
* @param spy The spy value
* @param jndiName The jndi name
*/
- public WrappedStatement(final WrappedConnection lc, Statement s, boolean spy, String jndiName)
+ public WrappedStatement(final WrappedConnection lc, Statement s, final boolean spy, final String jndiName)
{
this.lc = lc;
this.s = s;
this.spy = spy;
this.jndiName = jndiName;
+
lc.registerStatement(this);
}
@@ -96,24 +97,6 @@
}
/**
- * Get the spy value
- * @return The value
- */
- public boolean isSpy()
- {
- return spy;
- }
-
- /**
- * Get the jndi name
- * @return The value
- */
- public String getJndiName()
- {
- return jndiName;
- }
-
- /**
* {@inheritDoc}
*/
public void close() throws SQLException
@@ -121,8 +104,8 @@
if (closed.get())
return;
- if (isSpy())
- spyLogger.debugf("%s [%s] close()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] close()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
closed.set(true);
lc.unregisterStatement(this);
@@ -142,8 +125,8 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
- spyLogger.debugf("%s [%s] execute(%s)", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
+ if (spy)
+ spyLogger.debugf("%s [%s] execute(%s)", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
return s.execute(sql);
}
@@ -171,9 +154,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] execute(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, sql, autoGeneratedKeys);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, sql, autoGeneratedKeys);
return s.execute(sql, autoGeneratedKeys);
}
@@ -201,9 +184,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] execute(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT,
sql, Arrays.toString(columnIndexes));
return s.execute(sql, columnIndexes);
@@ -232,9 +215,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] execute(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT,
sql, Arrays.toString(columnNames));
return s.execute(sql, columnNames);
@@ -255,8 +238,8 @@
*/
public Connection getConnection() throws SQLException
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getConnection()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] getConnection()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return lc;
}
@@ -272,8 +255,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getWarnings()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] getWarnings()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getWarnings();
}
@@ -299,8 +282,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] clearWarnings()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] clearWarnings()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
s.clearWarnings();
}
@@ -328,9 +311,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeQuery(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
ResultSet result = s.executeQuery(sql);
return registerResultSet(result);
@@ -359,9 +342,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeUpdate(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
return s.executeUpdate(sql);
}
@@ -389,9 +372,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeUpdate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, sql, autoGeneratedKeys);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, sql, autoGeneratedKeys);
return s.executeUpdate(sql, autoGeneratedKeys);
}
@@ -419,9 +402,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeUpdate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT,
sql, Arrays.toString(columnIndexes));
return s.executeUpdate(sql, columnIndexes);
@@ -450,9 +433,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeUpdate(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT,
sql, Arrays.toString(columnNames));
return s.executeUpdate(sql, columnNames);
@@ -479,9 +462,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getMaxFieldSize()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getMaxFieldSize();
}
@@ -507,9 +490,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setMaxFieldSize(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, max);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, max);
s.setMaxFieldSize(max);
}
@@ -535,8 +518,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getMaxRows()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] getMaxRows()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getMaxRows();
}
@@ -562,9 +545,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setMaxRows(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, max);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, max);
s.setMaxRows(max);
}
@@ -590,9 +573,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setEscapeProcessing(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, enable);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, enable);
s.setEscapeProcessing(enable);
}
@@ -618,8 +601,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getQueryTimeout()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] getQueryTimeout()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getQueryTimeout();
}
@@ -645,9 +628,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setQueryTimeout(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, timeout);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, timeout);
s.setQueryTimeout(timeout);
}
@@ -670,8 +653,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] cancel()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] cancel()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
s.cancel();
}
@@ -692,9 +675,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setCursorName(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, name);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, name);
s.setCursorName(name);
}
@@ -720,8 +703,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getResultSet()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] getResultSet()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
ResultSet result = s.getResultSet();
if (result == null)
@@ -751,8 +734,8 @@
checkState();
try
{
- if (isSpy())
- spyLogger.debugf("%s [%s] getUpdateCount()", getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ if (spy)
+ spyLogger.debugf("%s [%s] getUpdateCount()", jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getUpdateCount();
}
@@ -778,9 +761,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getMoreResults()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getMoreResults();
}
@@ -806,9 +789,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getMoreResults(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, current);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, current);
return s.getMoreResults(current);
}
@@ -834,9 +817,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setFetchDirection(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, direction);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, direction);
s.setFetchDirection(direction);
}
@@ -862,9 +845,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFetchDirection()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getFetchDirection();
}
@@ -890,9 +873,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setFetchSize(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, rows);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, rows);
s.setFetchSize(rows);
}
@@ -918,9 +901,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getFetchSize()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getFetchSize();
}
@@ -946,9 +929,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getResultSetConcurrency()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getResultSetConcurrency();
}
@@ -974,9 +957,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getResultSetType()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getResultSetType();
}
@@ -1002,9 +985,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] addBatch(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT, sql);
s.addBatch(sql);
}
@@ -1030,9 +1013,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] clearBatch()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
s.clearBatch();
}
@@ -1060,9 +1043,9 @@
{
checkConfiguredQueryTimeout();
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] executeBatch()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.executeBatch();
}
@@ -1088,9 +1071,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getGeneratedKeys()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
ResultSet resultSet = s.getGeneratedKeys();
return registerResultSet(resultSet);
@@ -1117,9 +1100,9 @@
checkState();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getResultSetHoldability()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return s.getResultSetHoldability();
}
@@ -1142,9 +1125,9 @@
lock();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isClosed()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
Statement wrapped = getWrappedObject();
if (wrapped == null)
@@ -1172,9 +1155,9 @@
Statement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isPoolable()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return statement.isPoolable();
}
@@ -1200,9 +1183,9 @@
Statement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setPoolable(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT,
poolable);
statement.setPoolable(poolable);
@@ -1330,7 +1313,7 @@
protected ResultSet registerResultSet(ResultSet resultSet)
{
if (resultSet != null)
- resultSet = wrapResultSet(resultSet, isSpy(), getJndiName());
+ resultSet = wrapResultSet(resultSet, spy, jndiName);
if (lc.getTrackStatements() == BaseWrapperManagedConnectionFactory.TRACK_STATEMENTS_FALSE_INT)
return resultSet;
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/WrapperDataSource.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -46,6 +46,7 @@
*
* @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
* @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
* @version $Revision: 71788 $
*/
public class WrapperDataSource extends JBossWrapper implements Referenceable, DataSource, Serializable
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedCallableStatementJDK7.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedCallableStatementJDK7.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedCallableStatementJDK7.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -72,9 +72,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] closeOnCompletion()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
statement.closeOnCompletion();
}
@@ -92,9 +92,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isCloseOnCompletion()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT);
return statement.isCloseOnCompletion();
}
@@ -112,9 +112,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterIndex, type);
return statement.getObject(parameterIndex, type);
@@ -133,9 +133,9 @@
CallableStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CALLABLE_STATEMENT,
parameterName, type);
return statement.getObject(parameterName, type);
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedConnectionJDK7.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedConnectionJDK7.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedConnectionJDK7.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -105,9 +105,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setSchema(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
schema);
c.setSchema(schema);
@@ -134,9 +134,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getSchema()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.getSchema();
}
@@ -162,9 +162,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] abort(%s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
executor);
c.abort(executor);
@@ -191,9 +191,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] setNetworkTimeout(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION,
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION,
executor, milliseconds);
c.setNetworkTimeout(executor, milliseconds);
@@ -220,9 +220,9 @@
Connection c = getUnderlyingConnection();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getNetworkTimeout()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_CONNECTION);
+ jndiName, Constants.SPY_LOGGER_PREFIX_CONNECTION);
return c.getNetworkTimeout();
}
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedPreparedStatementJDK7.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedPreparedStatementJDK7.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedPreparedStatementJDK7.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -74,9 +74,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] closeOnCompletion()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
statement.closeOnCompletion();
}
@@ -102,9 +102,9 @@
PreparedStatement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isCloseOnCompletion()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_PREPARED_STATEMENT);
return statement.isCloseOnCompletion();
}
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedResultSetJDK7.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedResultSetJDK7.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedResultSetJDK7.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -59,9 +59,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
parameterIndex, type);
return resultSet.getObject(parameterIndex, type);
@@ -80,9 +80,9 @@
ResultSet resultSet = getUnderlyingResultSet();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] getObject(%s, %s)",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_RESULTSET,
+ jndiName, Constants.SPY_LOGGER_PREFIX_RESULTSET,
parameterName, type);
return resultSet.getObject(parameterName, type);
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedStatementJDK7.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedStatementJDK7.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/jdk7/WrappedStatementJDK7.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -74,9 +74,9 @@
Statement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] closeOnCompletion()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
statement.closeOnCompletion();
}
@@ -102,9 +102,9 @@
Statement statement = getUnderlyingStatement();
try
{
- if (isSpy())
+ if (spy)
spyLogger.debugf("%s [%s] isCloseOnCompletion()",
- getJndiName(), Constants.SPY_LOGGER_PREFIX_STATEMENT);
+ jndiName, Constants.SPY_LOGGER_PREFIX_STATEMENT);
return statement.isCloseOnCompletion();
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -99,4 +99,11 @@
public String getJndiName();
+ /**
+ * Get the spy.
+ *
+ * @return the spy.
+ */
+
+ public boolean isSpy();
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -245,11 +245,16 @@
*
*/
ENABLED("enabled"),
- /** jndiName attribute
+ /** use-java-context attribute
*
*/
- USEJAVACONTEXT("use-java-context");
+ USEJAVACONTEXT("use-java-context"),
+ /** spy attribute
+ *
+ */
+ SPY("spy");
+
private final String name;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -232,11 +232,16 @@
*
*/
ENABLED("enabled"),
- /** jndiName attribute
+ /** use-java-context attribute
*
*/
- USEJAVACONTEXT("use-java-context");
+ USEJAVACONTEXT("use-java-context"),
+ /** spy attribute
+ *
+ */
+ SPY("spy");
+
private final String name;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -99,6 +99,11 @@
protected final String jndiName;
/**
+ * spy
+ */
+ protected final boolean spy;
+
+ /**
* Create a new DataSourceAbstractImpl.
*
* @param transactionIsolation transactionIsolation
@@ -112,11 +117,13 @@
* @param poolName poolName
* @param enabled enabled
* @param jndiName jndiName
+ * @param spy spy
* @throws ValidateException ValidateException
*/
protected DataSourceAbstractImpl(TransactionIsolation transactionIsolation, TimeOut timeOut,
CommonSecurity security, Statement statement, Validation validation, String urlDelimiter,
- String urlSelectorStrategyClassName, Boolean useJavaContext, String poolName, Boolean enabled, String jndiName)
+ String urlSelectorStrategyClassName, Boolean useJavaContext, String poolName, Boolean enabled, String jndiName,
+ boolean spy)
throws ValidateException
{
super();
@@ -131,6 +138,7 @@
this.poolName = poolName;
this.enabled = enabled;
this.jndiName = jndiName;
+ this.spy = spy;
partialCommonValidation();
}
@@ -231,7 +239,19 @@
}
/**
+ * Get the spy
*
+ * @return the spy.
+ */
+
+ @Override
+ public final boolean isSpy()
+ {
+ return spy;
+ }
+
+ /**
+ *
* Partial validation for common fields defined in this abstract class
*
* @throws ValidateException ValidateException
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -77,6 +77,7 @@
* @param poolName poolName
* @param enabled enabled
* @param jndiName jndiName
+ * @param spy spy
* @param pool pool
* @throws ValidateException ValidateException
*/
@@ -84,10 +85,10 @@
TransactionIsolation transactionIsolation, Map<String, String> connectionProperties, TimeOut timeOut,
CommonSecurity security, Statement statement, Validation validation, String urlDelimiter,
String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext, String poolName,
- boolean enabled, String jndiName, CommonPool pool) throws ValidateException
+ boolean enabled, String jndiName, boolean spy, CommonPool pool) throws ValidateException
{
super(transactionIsolation, timeOut, security, statement, validation, urlDelimiter,
- urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName);
+ urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName, spy);
this.connectionUrl = connectionUrl;
this.driverClass = driverClass;
this.module = module;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -194,6 +194,7 @@
String poolName = null;
boolean enabled = true;
String jndiName = null;
+ boolean spy = false;
for (Attribute attribute : XaDataSource.Attribute.values())
{
@@ -215,6 +216,10 @@
useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
+ case SPY : {
+ spy = attributeAsBoolean(reader, attribute.getLocalName(), false);
+ break;
+ }
default :
break;
}
@@ -232,7 +237,7 @@
return new XADataSourceImpl(transactionIsolation, timeOutSettings, securitySettings,
statementSettings, validationSettings, urlDelimiter,
urlSelectorStrategyClassName, useJavaContext, poolName, enabled,
- jndiName, xaDataSourceProperty, xaDataSourceClass, module,
+ jndiName, spy, xaDataSourceProperty, xaDataSourceClass, module,
newConnectionSql, xaPool);
}
else
@@ -327,6 +332,7 @@
String poolName = null;
boolean enabled = true;
String jndiName = null;
+ boolean spy = false;
for (Attribute attribute : XaDataSource.Attribute.values())
{
@@ -348,6 +354,10 @@
useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
+ case SPY : {
+ spy = attributeAsBoolean(reader, attribute.getLocalName(), false);
+ break;
+ }
default :
break;
}
@@ -366,7 +376,7 @@
connectionProperties, timeOutSettings, securitySettings,
statementSettings, validationSettings, urlDelimiter,
urlSelectorStrategyClassName, newConnectionSql, useJavaContext, poolName,
- enabled, jndiName, pool);
+ enabled, jndiName, spy, pool);
}
else
{
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -70,6 +70,7 @@
* @param poolName poolName
* @param enabled enabled
* @param jndiName jndiName
+ * @param spy spy
* @param xaDataSourceProperty xaDataSourceProperty
* @param xaDataSourceClass xaDataSourceClass
* @param module module
@@ -79,12 +80,12 @@
*/
public XADataSourceImpl(TransactionIsolation transactionIsolation, TimeOut timeOut, CommonSecurity security,
Statement statement, Validation validation, String urlDelimiter, String urlSelectorStrategyClassName,
- boolean useJavaContext, String poolName, boolean enabled, String jndiName,
+ boolean useJavaContext, String poolName, boolean enabled, String jndiName, boolean spy,
Map<String, String> xaDataSourceProperty, String xaDataSourceClass, String module, String newConnectionSql,
CommonXaPool xaPool) throws ValidateException
{
super(transactionIsolation, timeOut, security, statement, validation, urlDelimiter,
- urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName);
+ urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName, spy);
if (xaDataSourceProperty != null)
{
this.xaDataSourceProperty = new HashMap<String, String>(xaDataSourceProperty.size());
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2011-02-01 17:14:31 UTC (rev 110507)
@@ -364,6 +364,17 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute default="false" name="spy" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Enable spy functionality on the JDBC layer - e.g. log all JDBC traffic to the datasource.
+ Remember to enable the logging category (org.jboss.jdbc) too.
+ Ex: spy="true"
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:attributeGroup>
<xs:simpleType name="transaction-isolationType">
<xs:annotation>
Added: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForSpyTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForSpyTestCase.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForSpyTestCase.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -0,0 +1,102 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.ds.DataSources;
+import org.jboss.jca.common.api.validator.ValidateException;
+import org.jboss.jca.common.metadata.ParserException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ *
+ * Test case for parsing the spy functionality parameter
+ *
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ *
+ */
+public class DsParserForSpyTestCase
+{
+
+ private static DsParser parser;
+
+ /**
+ *
+ * beforeClass method
+ *
+ * @throws Exception in casae of file not found
+ */
+ @BeforeClass
+ public static void beforeClass() throws Exception
+ {
+ parser = new DsParser();
+ }
+
+ /**
+ *
+ * Spy enabled for a datasource
+ *
+ * @throws Exception in case of parser error
+ */
+ @Test
+ public void shouldHaveSpyEnabled() throws Exception
+ {
+
+ //given
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("ds/unit/spy-ds.xml")
+ .toURI());
+ //when
+ DataSources ds = doParse(xmlFile);
+ //then
+ boolean actualSpy = ds.getDataSource().get(0).isSpy();
+ assertThat(actualSpy, is(true));
+ }
+
+ private DataSources doParse(File xmlFile)
+ throws FileNotFoundException, ParserException, IOException, ValidateException, Exception
+ {
+ FileInputStream is = null;
+
+ try
+ {
+ is = new FileInputStream(xmlFile);
+ //when
+ return parser.parse(is);
+
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+ }
+ }
+}
Added: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml 2011-02-01 17:14:31 UTC (rev 110507)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ <datasource jndi-name="java:/H2DS" pool-name="H2DS" spy="true">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver-class>org.h2.Driver</driver-class>
+ <pool>
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>10</max-pool-size>
+ </pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+
+</datasources>
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-02-01 17:14:31 UTC (rev 110507)
@@ -40,6 +40,7 @@
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
+import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -290,6 +291,13 @@
pool.setName(poolName);
+ // Spy
+ if (ds.isSpy())
+ {
+ injectValue(mcf, "setSpy", Boolean.TRUE);
+ injectValue(mcf, "setJndiName", jndiName);
+ }
+
// ConnectionFactory
return mcf.createConnectionFactory(cm);
}
@@ -374,6 +382,13 @@
pool.setName(poolName);
+ // Spy
+ if (ds.isSpy())
+ {
+ injectValue(mcf, "setSpy", Boolean.TRUE);
+ injectValue(mcf, "setJndiName", jndiName);
+ }
+
// ConnectionFactory
return mcf.createConnectionFactory(cm);
}
@@ -429,6 +444,33 @@
}
/**
+ * Inject value
+ * @param o The object
+ * @param methodName The method name
+ * @param value The value
+ * @exception Exception Thrown in case of an error
+ */
+ private void injectValue(Object o, String methodName, Object value) throws Exception
+ {
+ // Method has to be public
+ Method[] methods = o.getClass().getMethods();
+ if (methods != null)
+ {
+ boolean found = false;
+ for (int i = 0; !found && i < methods.length; i++)
+ {
+ Method m = methods[i];
+
+ if (m.getName().equals(methodName) && m.getParameterTypes().length == 1)
+ {
+ m.invoke(o, value);
+ found = true;
+ }
+ }
+ }
+ }
+
+ /**
* Provide the classloader of the deployment identified by the unique id
* @param uniqueId The
* @return The classloader used by this deployment
Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/schemas.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/schemas.xml 2011-02-01 17:12:49 UTC (rev 110506)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/schemas.xml 2011-02-01 17:14:31 UTC (rev 110507)
@@ -3942,6 +3942,17 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
+ <xs:attribute default="false" name="spy" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Enable spy functionality on the JDBC layer - e.g. log all JDBC traffic to the datasource.
+ Remember to enable the logging category (org.jboss.jdbc) too.
+ Ex: spy="true"
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
</xs:attributeGroup>
<xs:simpleType name="transaction-isolationType">
<xs:annotation>
More information about the jboss-cvs-commits
mailing list