mstover1 02/02/27 17:34:41
Modified: src/org/apache/jmeter/gui/action Start.java
src/org/apache/jmeter/protocol/jdbc/util
DBConnectionManager.java
Log:
Shutdown database connection pool when test is stopped.
Very bad kludge to do this for now, will fix better in 1.8.
Revision Changes Path
1.8 +3 -0 jakarta-jmeter/src/org/apache/jmeter/gui/action/Start.java
Index: Start.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/action/Start.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Start.java 26 Jul 2001 00:34:45 -0000 1.7
+++ Start.java 28 Feb 2002 01:34:41 -0000 1.8
@@ -106,6 +106,9 @@
engine.stopTest();
GuiPackage.getInstance().getMainFrame().setRunning(false);
engine = null;
+ // icky, icky kludge to make sure database pool shuts down
+ // need to make startTest and endTest events
+
org.apache.jmeter.protocol.jdbc.util.DBConnectionManager.getManager().shutdown();
}
}
static {
1.5 +7 -0
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/util/DBConnectionManager.java
Index: DBConnectionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/util/DBConnectionManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DBConnectionManager.java 26 Jul 2001 00:34:49 -0000 1.4
+++ DBConnectionManager.java 28 Feb 2002 01:34:41 -0000 1.5
@@ -171,6 +171,13 @@
System.gc();
} // End Method
+ public void shutdown()
+ {
+ Iterator iter = connections.keySet().iterator();
+ while (iter.hasNext()) {
+ close((DBKey)iter.next());
+ }
+ }
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
