mkalen 2005/03/17 01:57:06
Modified: src/java/org/apache/ojb/broker/platforms
PlatformOracle9iImpl.java
src/test/org/apache/ojb OJB-logging.properties
Log:
Merge with OJB_1_0_RELEASE branch: As reported by Don Lyon:
Oracle10g-connections under JBoss managed environments have externally
controlled statement caching. Don't throw exceptions if platform fails to set
statement caching. Add logging setting for easier user feedback on different
managed environments.
Revision Changes Path
1.19 +26 -10
db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformOracle9iImpl.java
Index: PlatformOracle9iImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/platforms/PlatformOracle9iImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PlatformOracle9iImpl.java 16 Mar 2005 11:40:38 -0000 1.18
+++ PlatformOracle9iImpl.java 17 Mar 2005 09:57:06 -0000 1.19
@@ -54,8 +54,8 @@
* see <a
href="http://asktom.oracle.com/pls/ask/f?p=4950:8:::::F4950_P8_DISPLAYID:127412348064";>Ask
TOM</A>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Matthew Baird</a>
- * @author <a href="mailto:[EMAIL PROTECTED]">Erik Forkalsrud</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Kalén</a>
+ * @author Contributions from: Erik Forkalsrud, Danilo Tommasina, Thierry
Hanot, Don Lyon
* @version CVS $Id$
* @see Platform
* @see PlatformDefaultImpl
@@ -203,7 +203,12 @@
}
catch (Exception e)
{
- throw new PlatformException(e);
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("PlatformOracle9iImpl could not enable
Oracle statement caching."
+ + " Original/unwrapped connection classes="
+ + conn.getClass().getName() + "/" +
oraConn.getClass().getName());
+ }
}
}
@@ -216,7 +221,12 @@
}
catch (Exception e)
{
- throw new PlatformException(e);
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("PlatformOracle9iImpl could not enable
Oracle row pre-fetching."
+ + "Original/unwrapped connection classes="
+ + conn.getClass().getName() + "/" +
oraConn.getClass().getName());
+ }
}
}
}
@@ -427,12 +437,15 @@
{
final Object unwrapped;
unwrapped = genericUnwrap(ORA_CONN_CLASS, conn,
UNWRAP_CONN_METHOD_NAMES, UNWRAP_CONN_PARAM_TYPES);
- if (unwrapped == null && logger.isDebugEnabled())
+ if (unwrapped == null)
{
// mkalen: only log this as debug since it will be logged for
every connection
// (ie only useful during development).
- logger.debug("PlatformOracle9iImpl could not unwrap " +
conn.getClass().getName() +
- ", Oracle-extensions disabled.");
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("PlatformOracle9iImpl could not unwrap " +
conn.getClass().getName() +
+ ", Oracle-extensions disabled.");
+ }
}
return (Connection) unwrapped;
}
@@ -446,12 +459,15 @@
{
final Object unwrapped;
unwrapped = genericUnwrap(ORA_PS_CLASS, ps, UNWRAP_PS_METHOD_NAMES,
UNWRAP_PS_PARAM_TYPES);
- if (unwrapped == null && logger.isDebugEnabled())
+ if (unwrapped == null)
{
// mkalen: only log this as debug since it will be logged for
every connection
// (ie only useful during development).
- logger.debug("PlatformOracle9iImpl could not unwrap " +
ps.getClass().getName() +
- ", large CLOB/BLOB support disabled.");
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("PlatformOracle9iImpl could not unwrap " +
ps.getClass().getName() +
+ ", large CLOB/BLOB support disabled.");
+ }
}
return (Statement) unwrapped;
}
1.3 +3 -1 db-ojb/src/test/org/apache/ojb/OJB-logging.properties
Index: OJB-logging.properties
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/OJB-logging.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OJB-logging.properties 11 Aug 2004 00:37:32 -0000 1.2
+++ OJB-logging.properties 17 Mar 2005 09:57:06 -0000 1.3
@@ -72,6 +72,8 @@
org.apache.ojb.broker.accesslayer.ConnectionManagerImpl.LogLevel=WARN
# Logger for IndirectionHandler class
org.apache.ojb.broker.core.proxy.IndirectionHandler.LogLevel=WARN
+# Logger for Oracle9i platform, useful for tracing failing Oracle-extensions
or large LOB-support
+org.apache.ojb.broker.platforms.PlatformOracle9iImpl.LogLevel=WARN
#
# Special Logger categories used in test suite and tutorials
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
