Merge "DBMap.java - Sonar Fix"
diff --git a/src/main/java/org/onap/dmaap/dbcapi/database/DBMap.java b/src/main/java/org/onap/dmaap/dbcapi/database/DBMap.java
index 6f63848..b3282ed 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/database/DBMap.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/database/DBMap.java
@@ -59,7 +59,7 @@
 		return(2);
 	}
 	public Collection<C> values() {
-		Collection<C> ret = new Vector<>();
+		Collection<C> ret = new ArrayList<>();
 		for (Map.Entry<String, C> x: list()) {
 			ret.add(x.getValue());
 		}
@@ -110,7 +110,6 @@
 		} catch (Exception e) {
 			throw new DBException(e);
 		}
-		PreparedStatement ps = null;
 		return((new ConnWrapper<C, C>() {
 			protected C run(C val) throws Exception {
 				ps = c.prepareStatement(insorreplstmt);