From df7c0e9d7a160c6c27d23628ce509b2d84de9687 Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Tue, 2 Sep 2014 13:35:34 +0000 Subject: [PATCH] condition on finally clause modified in the process method git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@99397 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../dataaccess/algorithms/drmalgorithms/GetTableDetails.java | 2 +- .../gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java | 2 +- .../gcube/dataaccess/algorithms/drmalgorithms/ListTables.java | 2 +- .../algorithms/drmalgorithms/RandomSampleOnTable.java | 2 +- .../dataaccess/algorithms/drmalgorithms/SampleOnTable.java | 2 +- .../dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java index 53af4fc..a8aa7e2 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java @@ -147,7 +147,7 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { } finally { - if (sf.isClosed() == false) { + if (sf!=null && sf.isClosed() == false) { mgt.closeConnection(); } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java index e99f93c..a6a88e8 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListSchemas.java @@ -164,7 +164,7 @@ public class ListSchemas extends StandardLocalExternalAlgorithm { } finally { - if (sf.isClosed() == false) { + if (sf!=null && sf.isClosed() == false) { mgt.closeConnection(); } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java index 34ca001..958f2ff 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/ListTables.java @@ -204,7 +204,7 @@ public class ListTables extends StandardLocalExternalAlgorithm { } finally { - if (sf.isClosed() == false) { + if (sf!=null && sf.isClosed() == false) { mgt.closeConnection(); } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java index 81bfe00..3556338 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/RandomSampleOnTable.java @@ -142,7 +142,7 @@ public class RandomSampleOnTable extends StandardLocalExternalAlgorithm { } finally { // close the connection - if (sf.isClosed() == false) { + if (sf!=null && sf.isClosed() == false) { mgt.closeConnection(); } } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java index 7d9987a..93f920d 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SampleOnTable.java @@ -140,7 +140,7 @@ public class SampleOnTable extends StandardLocalExternalAlgorithm { } finally { // close the connection - if (sf.isClosed() == false) { + if (sf!=null && sf.isClosed() == false) { mgt.closeConnection(); } } diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java index 4c6ee25..14260d0 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/SmartSampleOnTable.java @@ -141,7 +141,7 @@ public class SmartSampleOnTable extends StandardLocalExternalAlgorithm { } finally { // close the connection - if (sf.isClosed() == false) { + if (sf!=null && sf.isClosed() == false) { mgt.closeConnection(); } }