Author: fhanik
Date: Thu Mar 31 22:28:54 2011
New Revision: 1087467
URL: http://svn.apache.org/viewvc?rev=1087467&view=rev
Log:
Implement exception traps as suggested by Eiji Takahashi
http://markmail.org/message/c7hrhky4jtgcto76
Added:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1087467&r1=1087466&r2=1087467&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Mar 31 22:28:54 2011
@@ -401,15 +401,17 @@ public class PoolProperties implements P
interceptors = new InterceptorDefinition[0];
} else {
String[] interceptorValues = jdbcInterceptors.split(";");
- InterceptorDefinition[] definitions = new
InterceptorDefinition[interceptorValues.length];
+ InterceptorDefinition[] definitions = new
InterceptorDefinition[interceptorValues.length+1];
+ //always add the trap interceptor to the mix
+ definitions[0] = new
InterceptorDefinition(TrapException.class);
for (int i=0; i<interceptorValues.length; i++) {
int propIndex = interceptorValues[i].indexOf("(");
int endIndex = interceptorValues[i].indexOf(")");
if (propIndex<0 || endIndex<0 || endIndex <= propIndex) {
- definitions[i] = new
InterceptorDefinition(interceptorValues[i].trim());
+ definitions[i+1] = new
InterceptorDefinition(interceptorValues[i].trim());
} else {
String name =
interceptorValues[i].substring(0,propIndex).trim();
- definitions[i] = new InterceptorDefinition(name);
+ definitions[i+1] = new InterceptorDefinition(name);
String propsAsString =
interceptorValues[i].substring(propIndex+1, interceptorValues[i].length()-1);
String[] props = propsAsString.split(",");
for (int j=0; j<props.length; j++) {
@@ -810,6 +812,11 @@ public class PoolProperties implements P
public InterceptorDefinition(String className) {
this.className = className;
}
+
+ public InterceptorDefinition(Class<?> cl) {
+ this(cl.getName());
+ clazz = cl;
+ }
public String getClassName() {
return className;
Added:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java?rev=1087467&view=auto
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/TrapException.java
Thu Mar 31 22:28:54 2011
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.jdbc.pool;
+
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.SQLException;
+/**
+ * Interceptor that traps any unhandled exception types and throws an
exception that has been declared by the method
+ * called, or throw a SQLException if it is declared.
+ * If the caught exception is not declared, and the method doesn't throw
SQLException, then this interceptor will
+ * throw a RuntimeException
+ * @author fhanik
+ *
+ */
+public class TrapException extends JdbcInterceptor {
+
+
+ public TrapException() {
+ }
+
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
+ try {
+ return super.invoke(proxy, method, args);
+ }catch (Throwable t) {
+ Throwable exception = t;
+ if (t instanceof InvocationTargetException) {
+ InvocationTargetException it = (InvocationTargetException)t;
+ exception = it.getCause()!=null?it.getCause():it;
+ }
+ Class<?> exceptionClass = exception.getClass();
+ if (!isDeclaredException(method, exceptionClass)) {
+ if (isDeclaredException(method,SQLException.class)) {
+ SQLException sqlx = new SQLException("Uncaught underlying
exception.");
+ sqlx.initCause(exception);
+ exception = sqlx;
+ } else {
+ RuntimeException rx = new RuntimeException("Uncaught
underlying exception.");
+ rx.initCause(exception);
+ exception = rx;
+ }
+ }
+ throw exception;
+ }
+
+ }
+
+ public boolean isDeclaredException(Method m, Class<?> clazz) {
+ for (Class<?> cl : m.getExceptionTypes()) {
+ if (cl.equals(clazz)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * no-op for this interceptor. no state is stored.
+ */
+ @Override
+ public void reset(ConnectionPool parent, PooledConnection con) {
+ // NOOP
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
