sebb 2004/10/17 09:01:38
Modified: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler
Tag: rel-2_0 JDBCSampler.java
Log:
Bug 28663 - NPE in remote JDBC
Revision Changes Path
No revision
No revision
1.27.2.2 +13 -7
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Index: JDBCSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- JDBCSampler.java 14 Oct 2004 00:40:20 -0000 1.27.2.1
+++ JDBCSampler.java 17 Oct 2004 16:01:38 -0000 1.27.2.2
@@ -18,6 +18,9 @@
package org.apache.jmeter.protocol.jdbc.sampler;
+import java.io.IOException;
+import java.io.NotActiveException;
+import java.io.ObjectInputStream;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@@ -73,12 +76,14 @@
{
}
- public Object clone(){
- Object o = super.clone();
- JDBCSampler s = (JDBCSampler) o;
- s.manager=DBConnectionManager.getManager();
- return o;
+ // Resolve the transient manager object
+ private void readObject(ObjectInputStream is)
+ throws NotActiveException, IOException, ClassNotFoundException
+ {
+ is.defaultReadObject();
+ manager = DBConnectionManager.getManager();
}
+
public SampleResult sample(Entry e)
{
DBKey key = null;
@@ -139,6 +144,7 @@
catch (Exception ex)
{
log.error("Error in JDBC sampling", ex);
+ res.setResponseMessage(ex.toString());
res.setResponseData(new byte[0]);
res.setSuccessful(false);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
