OODT-927 Values passed to SQL commands should be sanitized in CAS 
DataSourceIngestMapper.java, ensure that we don't override abstract methods 
isClosed()


Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/f09e721c
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/f09e721c
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/f09e721c

Branch: refs/heads/avrorpc
Commit: f09e721cbafbca51cbc05618be79c3eec8656cd1
Parents: 2e5d978
Author: Lewis John McGibbney <[email protected]>
Authored: Fri Jun 3 10:40:17 2016 -0700
Committer: Lewis John McGibbney <[email protected]>
Committed: Fri Jun 3 10:40:17 2016 -0700

----------------------------------------------------------------------
 .../cas/catalog/mapping/DataSourceIngestMapper.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oodt/blob/f09e721c/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
----------------------------------------------------------------------
diff --git 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
index 3548570..ca6e53c 100644
--- 
a/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
+++ 
b/catalog/src/main/java/org/apache/oodt/cas/catalog/mapping/DataSourceIngestMapper.java
@@ -110,7 +110,7 @@ public class DataSourceIngestMapper implements IngestMapper 
{
                        }
                        return null;
                }finally {
-      if (rs != null && !rs.isClosed()) {
+      if (rs != null) {
           rs.close();
       }
                }
@@ -131,7 +131,7 @@ public class DataSourceIngestMapper implements IngestMapper 
{
                        }
                        return null;
                }finally {
-      if (rs != null && !rs.isClosed()) {
+      if (rs != null) {
         rs.close();
       }
                }
@@ -152,7 +152,7 @@ public class DataSourceIngestMapper implements IngestMapper 
{
                        }
                        return catalogIds;
                }finally {
-      if (rs != null && !rs.isClosed()) {
+      if (rs != null) {
         rs.close();
       }
                }       
@@ -179,7 +179,7 @@ public class DataSourceIngestMapper implements IngestMapper 
{
                        }
                        return transactionIds;
                }finally {
-      if (rs != null && !rs.isClosed()) {
+      if (rs != null) {
         rs.close();
       }
                }
@@ -196,7 +196,7 @@ public class DataSourceIngestMapper implements IngestMapper 
{
                        rs = pstmt.executeQuery();
                        return rs.next();
                }finally {
-      if (rs != null && !rs.isClosed()) {
+      if (rs != null) {
         rs.close();
       }
                }
@@ -243,7 +243,7 @@ public class DataSourceIngestMapper implements IngestMapper 
{
                                return null;
                        }
                }finally {
-      if (rs != null && !rs.isClosed()) {
+      if (rs != null) {
         rs.close();
       }
                }

Reply via email to