Author: sebb
Date: Tue Sep 4 05:44:08 2007
New Revision: 572652
URL: http://svn.apache.org/viewvc?rev=572652&view=rev
Log:
Handle invalid data types more gracefully
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?rev=572652&r1=572651&r2=572652&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Tue Sep 4 05:44:08 2007
@@ -45,8 +45,6 @@
/**
* A sampler which understands JDBC database requests.
*
- * @author Original author unknown
- * @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Arnold</a>
*/
public class JDBCSampler extends AbstractSampler implements TestBean {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -71,7 +69,7 @@
Integer value = (Integer)fields[i].get(null);
mapJdbcNameToInt.put(name.toLowerCase(),value);
} catch (IllegalAccessException e) {
- throw new RuntimeException(e);
+ throw new RuntimeException(e); // should not happen
}
}
}
@@ -265,8 +263,12 @@
}
- private static int getJdbcType(String jdbcType) {
- return
((Integer)mapJdbcNameToInt.get(jdbcType.toLowerCase())).intValue();
+ private static int getJdbcType(String jdbcType) throws SQLException {
+ Integer entry = (Integer)mapJdbcNameToInt.get(jdbcType.toLowerCase());
+ if (entry == null) {
+ throw new SQLException("Invalid data type: "+jdbcType);
+ }
+ return (entry).intValue();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]