Author: dwoods
Date: Tue Nov 2 19:16:21 2010
New Revision: 1030183
URL: http://svn.apache.org/viewvc?rev=1030183&view=rev
Log:
OPENJPA-1764 protect against java.lang.NoClassDefFoundError when being used in
an app server but as app managed and the JVM exits quickly from under us
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java?rev=1030183&r1=1030182&r2=1030183&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DBCPDriverDataSource.java
Tue Nov 2 19:16:21 2010
@@ -76,7 +76,9 @@ extends SimpleDriverDataSource implement
((org.apache.commons.dbcp.BasicDataSource)_dbcpClass.cast(_ds)).close();
}
}
- } catch (ClassCastException cce) {
+ } catch (Exception e) {
+ // no-op
+ } catch (Throwable t) {
// no-op
} finally {
_ds = null;