From e9a52d3c2699b0b2fe5cfdb1061dbd6676d48e45 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 16 Jun 2008 10:56:26 +0800
Subject: [PATCH] update for EOFM-122

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java |    4 +++-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java                       |    2 +-
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java    |    2 ++
 3 files changed, 6 insertions(+), 2 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 d776562..8d64a62 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
@@ -362,10 +362,10 @@
         ResultSet rs = null;
 
         stmt.setFetchSize(FETCHSIZE);
-        int size = rs.getMetaData().getColumnCount();
         try
         {
             rs = stmt.executeQuery(fetchStmt);
+            int size = rs.getMetaData().getColumnCount();
 
             while (rs.next())
             {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java
index fff840d..f919f16 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java
@@ -391,10 +391,12 @@
                 if (allowTable(tableName) && (tableName != null)
                         && (tableName.equalsIgnoreCase(table)))
                 {
+                    tables.close();
                     return (true);
                 }
             }
 
+            tables.close();
             return false;
         } catch (SQLException sqlException)
         {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java
index b4adcab..bd4d0c8 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java
@@ -395,10 +395,12 @@
                 if (allowTable(tableName) && (tableName != null)
                         && (tableName.equalsIgnoreCase(table)))
                 {
-                    return (true);
+                    tables.close();
+                    return true;
                 }
             }
 
+            tables.close();
             return false;
         } catch (SQLException sqlException)
         {

--
Gitblit v0.0.0-SNAPSHOT