Author: dwoods
Date: Wed Oct 13 17:04:57 2010
New Revision: 1022190
URL: http://svn.apache.org/viewvc?rev=1022190&view=rev
Log:
close DriverDataSource when we're done with it
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?rev=1022190&r1=1022189&r2=1022190&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
Wed Oct 13 17:04:57 2010
@@ -504,6 +504,7 @@ public class MappingTool
tool.setSchemaGroup(getSchemaGroup());
tool.run();
tool.record();
+ tool.clear();
}
}
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java?rev=1022190&r1=1022189&r2=1022190&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
Wed Oct 13 17:04:57 2010
@@ -44,6 +44,8 @@ import org.apache.openjpa.jdbc.sql.DBDic
import org.apache.openjpa.jdbc.sql.SQLExceptions;
import org.apache.openjpa.lib.conf.Configurations;
import org.apache.openjpa.lib.identifier.IdentifierUtil;
+import org.apache.openjpa.lib.jdbc.DecoratingDataSource;
+import org.apache.openjpa.lib.jdbc.DelegatingDataSource;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.meta.MetaDataSerializer;
import org.apache.openjpa.lib.util.Files;
@@ -138,6 +140,19 @@ public class SchemaTool {
}
/**
+ * Cleanup DataSource after run()/record()
+ */
+ public void clear() {
+ if (_ds != null && _ds instanceof DelegatingDataSource) {
+ try {
+ ((DelegatingDataSource)_ds).close();
+ } catch (Exception e) {
+ // no-op
+ }
+ }
+ }
+
+ /**
* The action supplied on construction.
*/
public String getAction() {
