bug: Connection sometimes closed when getUserName called

Change-Id: Ic870c58cf292b27c339c2f77e7fe77e86dd4c011

1 files changed, 4 insertions, 11 deletions

diff --git a/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/schema/ops/LoadUserSchemasCallable.java b/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/schema/ops/LoadUserSchemasCallable.java
index 0100e1cc2a6..6b3d2bdbb44 100644
--- a/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/schema/ops/LoadUserSchemasCallable.java
+++ b/plugins/org.eclipse.osee.jdbc/src/org/eclipse/osee/jdbc/internal/schema/ops/LoadUserSchemasCallable.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.jdbc.JdbcClient;
 import org.eclipse.osee.jdbc.JdbcConnection;
@@ -52,15 +51,6 @@ public class LoadUserSchemasCallable implements Callable<Void> {
       this.options = options;
    }
 
-   private DatabaseMetaData getMetaData() throws OseeCoreException {
-      JdbcConnection connection = client.getConnection();
-      try {
-         return connection.getMetaData();
-      } finally {
-         connection.close();
-      }
-   }
-
    private Set<JdbcSchemaResource> getValidSchemas() {
       Set<JdbcSchemaResource> schemasToParse = new LinkedHashSet<JdbcSchemaResource>();
       for (JdbcSchemaResource resource : schemaResources) {
@@ -78,8 +68,9 @@ public class LoadUserSchemasCallable implements Callable<Void> {
       parser.parse(getValidSchemas(), schemas);
 
       if (!options.isUseFileSpecifiedSchemas()) {
+         JdbcConnection connection = client.getConnection();
          try {
-            DatabaseMetaData meta = getMetaData();
+            DatabaseMetaData meta = connection.getMetaData();
             if (meta != null) {
                String userName = meta.getUserName();
                if (Strings.isValid(userName)) {
@@ -94,6 +85,8 @@ public class LoadUserSchemasCallable implements Callable<Void> {
             }
          } catch (SQLException ex) {
             throw newJdbcException(ex);
+         } finally {
+            connection.close();
          }
       }