format & result.close

alibaba · Jun 29, 2016 · 575f9cc · 575f9cc
1 parent 615ec43
commit 575f9cc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/src/main/java/com/taobao/yugong/common/alarm/MailAlarmService.java b/src/main/java/com/taobao/yugong/common/alarm/MailAlarmService.java
@@ -17,13 +17,13 @@
  */
 public class MailAlarmService extends AbstractAlarmService {
 
-    private static final String TITLE = "alarm_from_yugong";
-    private JavaMailSender mailSender;
-    private String emailUsername;
-    private String emailPassword;
-    private String emailHost;
-    private int stmpPort = 465;
-    private boolean sslSupport = true;
+    private static final String TITLE      = "alarm_from_yugong";
+    private JavaMailSender      mailSender;
+    private String              emailUsername;
+    private String              emailPassword;
+    private String              emailHost;
+    private int                 stmpPort   = 465;
+    private boolean             sslSupport = true;
 
     @Override
     public void start() {

diff --git a/src/main/java/com/taobao/yugong/controller/YuGongController.java b/src/main/java/com/taobao/yugong/controller/YuGongController.java
@@ -1,5 +1,26 @@
 package com.taobao.yugong.controller;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.sql.DataSource;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.MDC;
+import org.springframework.jdbc.core.JdbcTemplate;
+
 import com.google.common.collect.Lists;
 import com.taobao.yugong.applier.AllRecordApplier;
 import com.taobao.yugong.applier.CheckRecordApplier;
@@ -42,27 +63,6 @@
 import com.taobao.yugong.positioner.RecordPositioner;
 import com.taobao.yugong.translator.DataTranslator;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.MDC;
-import org.springframework.jdbc.core.JdbcTemplate;
-
 /**
  * 整个迁移流程调度控制
  * 

diff --git a/src/main/java/com/taobao/yugong/extractor/oracle/OracleMaterializedIncRecordExtractor.java b/src/main/java/com/taobao/yugong/extractor/oracle/OracleMaterializedIncRecordExtractor.java
@@ -195,6 +195,7 @@ public Object doInPreparedStatement(PreparedStatement ps) throws SQLException, D
                     result.add(record);
                 }
 
+                rs.close();
                 return result;
             }
         });

diff --git a/src/main/java/com/taobao/yugong/extractor/oracle/OracleOnceFullRecordExtractor.java b/src/main/java/com/taobao/yugong/extractor/oracle/OracleOnceFullRecordExtractor.java
@@ -146,6 +146,7 @@ public Object doInStatement(Statement stmt) throws SQLException, DataAccessExcep
                     }
 
                     setStatus(ExtractStatus.TABLE_END);
+                    rs.close();
                     return null;
                 }
             });
-Original file line number
+Diff line change
@@ Expand Up @@
                         result.add(record);
                     }
+                    rs.close();
                     return result;
                 }
             });
@@ Expand Down @@