From 9cc8b6e52409d8814d948fd9a127edd6d7610f32 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Wed, 29 Jun 2011 09:17:01 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@310 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../java/com/alibaba/druid/pool/DruidAbstractDataSource.java    | 1 -
 .../com/alibaba/druid/pool/{vendor => }/ExceptionSorter.java    | 2 +-
 src/main/java/com/alibaba/druid/pool/PoolableConnection.java    | 1 -
 .../com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java     | 2 ++
 .../com/alibaba/druid/pool/vendor/OracleExceptionSorter.java    | 2 ++
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename src/main/java/com/alibaba/druid/pool/{vendor => }/ExceptionSorter.java (90%)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index 8653bdeb3f..2568de3795 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -38,7 +38,6 @@ import javax.sql.DataSource;
 
 import com.alibaba.druid.filter.Filter;
 import com.alibaba.druid.filter.FilterChainImpl;
-import com.alibaba.druid.pool.vendor.ExceptionSorter;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
 import com.alibaba.druid.util.DruidLoaderUtils;
 
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/ExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java
similarity index 90%
rename from src/main/java/com/alibaba/druid/pool/vendor/ExceptionSorter.java
rename to src/main/java/com/alibaba/druid/pool/ExceptionSorter.java
index 2968b15ff1..d648e6ffe6 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/ExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/ExceptionSorter.java
@@ -1,4 +1,4 @@
-package com.alibaba.druid.pool.vendor;
+package com.alibaba.druid.pool;
 
 import java.sql.SQLException;
 
diff --git a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java
index 633b1cc4d6..5e0856186b 100644
--- a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java
+++ b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java
@@ -40,7 +40,6 @@ import javax.sql.StatementEventListener;
 
 import com.alibaba.druid.pool.PoolablePreparedStatement.PreparedStatementKey;
 import com.alibaba.druid.pool.PreparedStatementPool.MethodType;
-import com.alibaba.druid.pool.vendor.ExceptionSorter;
 
 /**
  * @author wenshao<szujobs@hotmail.com>
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
index cec7af8206..ac91dcd19a 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
@@ -2,6 +2,8 @@ package com.alibaba.druid.pool.vendor;
 
 import java.sql.SQLException;
 
+import com.alibaba.druid.pool.ExceptionSorter;
+
 public class MySqlExceptionSorter implements ExceptionSorter {
 
     @Override
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java
index 96d9f8fc44..83697b2290 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java
@@ -3,6 +3,8 @@ package com.alibaba.druid.pool.vendor;
 import java.io.Serializable;
 import java.sql.SQLException;
 
+import com.alibaba.druid.pool.ExceptionSorter;
+
 /**
  * Implementation of ExceptionSorter for Oracle.
  */