X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fdatabase%2FConnectionFactory.java;h=aee3ff1b2ef09c2761a61bbab8fb3b2440190454;hb=9f2dfd0f577f3ad6bae0b110b89c72267ff6f914;hp=1d93d68b5a99a48c43e51eb8088fa94f37396eaf;hpb=0bff051a842b164b680bc938f4a56db435dd5841;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java b/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java
index 1d93d68..aee3ff1 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java
@@ -23,12 +23,9 @@ package org.onap.dmaap.dbcapi.database;
 import java.sql.*;
 import java.util.*;
 
-import org.apache.log4j.Logger;
-
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
-import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 public class ConnectionFactory	{
@@ -52,12 +49,15 @@ public class ConnectionFactory	{
 	private String	dbname;
 	private String	dbuser;
 	private String	dbcr;
+	private String  schema;
+	
 	public ConnectionFactory() {
 		Properties p = DmaapConfig.getConfig();
 		host = p.getProperty("DB.host", "dcae-pstg-write-ftl.domain.notset.com");
 		dbname = p.getProperty("DB.name", "dmaap");
 		dbuser = p.getProperty("DB.user", "dmaap_admin");
 		dbcr = p.getProperty("DB.cred", "test234-ftl");
+		schema = p.getProperty("DB.schema", "public");
 	}
 	public static ConnectionFactory getDefaultInstance() {
 		return(instance);
@@ -77,6 +77,9 @@ public class ConnectionFactory	{
 		p.put("password", dbcr);
 		return(DriverManager.getConnection("jdbc:postgresql://" + host + "/" + dbname, p));
 	}
+	public String getSchema() {
+		return(schema);
+	}
 	public void release(Connection c) {
 		synchronized(this) {
 			if (cur < pool.length) {
@@ -84,6 +87,10 @@ public class ConnectionFactory	{
 				return;
 			}
 		}
-		try { c.close(); } catch (Exception e) {}
+		try { 
+			c.close(); 
+		} catch (Exception e) {
+			logger.error("Error", e);
+		}
 	}
 }