Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

修正拼写错误

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@846 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-19 01:20:46 +00:00
parent f9949aee78
commit 7d60b388da
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+8 -8
View File
@@ -122,7 +122,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
System.out);
protected List<Filter> filters = new ArrayList<Filter>();
protected ExceptionSorter exceptionSoter = null;
protected ExceptionSorter exceptionSorter = null;
protected Driver driver;
@@ -736,12 +736,12 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
this.driver = driver;
}
public ExceptionSorter getExceptionSoter() {
return exceptionSoter;
public ExceptionSorter getExceptionSorter() {
return exceptionSorter;
}
public void setExceptionSoter(ExceptionSorter exceptionSoter) {
this.exceptionSoter = exceptionSoter;
public void setExceptionSorter(ExceptionSorter exceptionSoter) {
this.exceptionSorter = exceptionSoter;
}
// 兼容JBOSS
@@ -751,18 +751,18 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
public void setExceptionSorter(String exceptionSorter) throws Exception {
if (exceptionSorter == null) {
this.exceptionSoter = NullExceptionSorter.getInstance();
this.exceptionSorter = NullExceptionSorter.getInstance();
return;
}
exceptionSorter = exceptionSorter.trim();
if (exceptionSorter.length() == 0) {
this.exceptionSoter = NullExceptionSorter.getInstance();
this.exceptionSorter = NullExceptionSorter.getInstance();
return;
}
Class<?> clazz = DruidLoaderUtils.loadClass(exceptionSorter);
this.exceptionSoter = (ExceptionSorter) clazz.newInstance();
this.exceptionSorter = (ExceptionSorter) clazz.newInstance();
}
@Override
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+6 -6
View File
@@ -225,23 +225,23 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
String realDriverClassName = driver.getClass().getName();
if (realDriverClassName.equals("com.mysql.jdbc.Driver")) {
this.validConnectionChecker = new MySqlValidConnectionChecker();
this.exceptionSoter = new MySqlExceptionSorter();
this.exceptionSorter = new MySqlExceptionSorter();
} else if (realDriverClassName.equals("oracle.jdbc.driver.OracleDriver")) {
this.validConnectionChecker = new OracleValidConnectionChecker();
this.exceptionSoter = new OracleExceptionSorter();
this.exceptionSorter = new OracleExceptionSorter();
} else if (realDriverClassName.equals("com.microsoft.jdbc.sqlserver.SQLServerDriver")) {
this.validConnectionChecker = new MSSQLValidConnectionChecker();
} else if (realDriverClassName.equals("com.informix.jdbc.IfxDriver")) {
this.exceptionSoter = new InformixExceptionSorter();
this.exceptionSorter = new InformixExceptionSorter();
} else if (realDriverClassName.equals("com.sybase.jdbc2.jdbc.SybDriver")) {
this.exceptionSoter = new SybaseExceptionSorter();
this.exceptionSorter = new SybaseExceptionSorter();
} else if (realDriverClassName.equals("com.alibaba.druid.mock.MockDriver")) {
this.exceptionSoter = new MockExceptionSorter();
this.exceptionSorter = new MockExceptionSorter();
}
for (Filter filter : filters) {
@@ -439,7 +439,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
// exceptionSorter.isExceptionFatal
if (exceptionSoter != null && exceptionSoter.isExceptionFatal(sqlEx)) {
if (exceptionSorter != null && exceptionSorter.isExceptionFatal(sqlEx)) {
this.discardConnection(holder.getConnection());
pooledConnection.disable();
}
src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java
+2 -2
View File
@@ -44,9 +44,9 @@ public class PoolableStatementTest2 extends TestCase {
dataSource.setRemoveAbandoned(true);
dataSource.setExceptionSorterClassName(null);
Assert.assertTrue(dataSource.getExceptionSoter() instanceof NullExceptionSorter);
Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter);
dataSource.setExceptionSorterClassName("");
Assert.assertTrue(dataSource.getExceptionSoter() instanceof NullExceptionSorter);
Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter);
JdbcStatContext context = new JdbcStatContext();
context.setTraceEnable(true);
src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java
+2 -2
View File
@@ -41,9 +41,9 @@ public class TestDataSourceBasic extends TestCase {
dataSource.setRemoveAbandoned(true);
dataSource.setExceptionSorterClassName(null);
Assert.assertTrue(dataSource.getExceptionSoter() instanceof NullExceptionSorter);
Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter);
dataSource.setExceptionSorterClassName("");
Assert.assertTrue(dataSource.getExceptionSoter() instanceof NullExceptionSorter);
Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter);
}
protected void tearDown() throws Exception {