From 58c349c24c1d45ad925344072fb654b58b7f83d5 Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Mon, 10 Oct 2016 15:13:34 +0800
Subject: [PATCH] =?UTF-8?q?OracleConnector=E7=B1=BB=E7=9A=84ConnectionBuil?=
 =?UTF-8?q?der=E6=96=B9=E6=B3=95=E7=9A=84=E5=BC=82=E5=B8=B8=E6=8A=9B?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/platform/oracle/OracleConnector.java  | 21 +++++++++++++++----
 .../service/OracleExtractService.java         |  7 ++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/com/platform/oracle/OracleConnector.java b/src/com/platform/oracle/OracleConnector.java
index c792c531..236f5a66 100644
--- a/src/com/platform/oracle/OracleConnector.java
+++ b/src/com/platform/oracle/OracleConnector.java
@@ -26,23 +26,30 @@ public class OracleConnector {
 	
 
 	public synchronized static Connection ConnectionBuilder(String url, String user,
-			String password, OracleConnectorParams oc) {	
+			String password, OracleConnectorParams oc) throws CustomException {	
 		Connection conn=null;
 		try {
 			conn = DriverManager.getConnection(url, user, password);
 		} catch (SQLException e) {		
-			new CustomException(Custom4exception.OracleSQL_Except, e);
 			Configs.CONSOLE_LOGGER.info("创建oracle连接失败: [" + e.getMessage() + "]");
 			if (null != oc) {
 				FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
 						+ oc.getName(), "创建oracle连接失败: [" + e.getMessage() + "]\r\n");
 			}
+			throw new CustomException(Custom4exception.OracleSQL_Except, e);
 		}
 		return conn;
 	}
 
 	public synchronized static boolean canConnect(String url, String user, String password) {
-		return (null != ConnectionBuilder(url, user, password, null));
+		Connection result = null;
+		try {
+			result = ConnectionBuilder(url, user, password, null);
+		} catch (CustomException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return (null != result);
 	}
 
 	public synchronized static ResultSet getSQLExecResultSet(Connection conn, String sql, String filePath) {
@@ -65,7 +72,13 @@ public class OracleConnector {
 
 	public synchronized static ResultSet getSQLExecResultSet(String url, String user,
 			String password, String sql, String filePath) {
-		return getSQLExecResultSet(ConnectionBuilder(url, user, password, null), sql, filePath);
+		 ResultSet result = null;
+		try {
+			 result = getSQLExecResultSet(ConnectionBuilder(url, user, password, null), sql, filePath);
+		} catch (CustomException e) {
+			new CustomException(Custom4exception.OracleSQL_Except, e);
+		}
+		return result;
 	}
 
 	/**
diff --git a/src/com/platform/service/OracleExtractService.java b/src/com/platform/service/OracleExtractService.java
index 23df97ce..d6745b6e 100644
--- a/src/com/platform/service/OracleExtractService.java
+++ b/src/com/platform/service/OracleExtractService.java
@@ -2,6 +2,7 @@ package com.platform.service;
 
 
 
+import com.base.CustomException;
 import com.platform.entities.OracleConnectorParams;
 import com.platform.oracle.OracleConnector;
 import com.platform.utils.Configs;
@@ -13,7 +14,11 @@ public class OracleExtractService extends Thread implements Runnable {
 	public OracleExtractService(OracleConnectorParams ocp){
 		this.ocp=ocp;
 		String url  = "";
-		this.conn=OracleConnector.ConnectionBuilder(url, Configs.GATHER_USER_NAME, Configs.GATHER_USER_PASSWORD, null);
+		try {
+			this.conn=OracleConnector.ConnectionBuilder(url, Configs.GATHER_USER_NAME, Configs.GATHER_USER_PASSWORD, null);
+		} catch (CustomException e) {
+			this.conn = null;
+		}
 	}
 	@Override
 	public void run() {