diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index aa647596ed..43003c3548 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -122,7 +122,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements System.out); protected List filters = new ArrayList(); - 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 diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 99072b41e4..f32ca0a623 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -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(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java index 908aa7b5ef..7e57e0c9a7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java @@ -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); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java index eda362595e..b07c583710 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java @@ -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 {