From 78792a3cca250c5d4f91f782c1697d4d9d180936 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 13 Jun 2008 19:18:46 +0800
Subject: [PATCH] update for EOFM-117

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
index 49ae703..0128a4a 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
@@ -287,6 +287,7 @@
         Statement stmt = connection.createStatement();
         stmt.execute(AbstractOracleJobContext.TRUNCATE_CONNECTIVITY_WEBCHECK);
         stmt.execute(AbstractOracleJobContext.COPY_CONNECTIVITY_TO_WEBCHECK);
+        stmt.close();
     }
 
     private void exetcuteConvert(OracleConvertPostGISJobContext jobContext,
@@ -411,9 +412,9 @@
         Statement stmt = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 
         stmt.setFetchSize(FETCHSIZE);
-
         ResultSet rs = stmt.executeQuery(fetchStmt);
-
+        try
+        {
         while (rs.next())
         {
             int size = rs.getMetaData().getColumnCount();
@@ -433,10 +434,11 @@
             else
                 pair.second = name;
         }
-
+        } finally
+        {
         rs.close();
         stmt.close();
-
+        }
         return orderedMap;
     }
 
@@ -450,7 +452,6 @@
         Statement stmtSrc = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 
         stmtSrc.setFetchSize(FETCHSIZE);
-
         ResultSet rsSrc = stmtSrc.executeQuery(fetchSrcStmt);
 
         while (rsSrc.next())
@@ -492,9 +493,10 @@
         Statement stmtDest = connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 
         stmtDest.setFetchSize(FETCHSIZE);
-
         ResultSet rsDest = stmtDest.executeQuery(fetchDestStmt);
 
+        try
+        {
         while (rsDest.next())
         {
             ARRAY rawsValue = ((OracleResultSet) rsDest).getARRAY(1);
@@ -524,9 +526,11 @@
                 logger.warn("Dgn7Exception:" + e.getMessage(), e);
             }
         }
-
+        } finally
+        {
         rsDest.close();
         stmtDest.close();
+        }
     }
 
     // Binary to Element

--
Gitblit v0.0.0-SNAPSHOT