Repository: oodt Updated Branches: refs/heads/master af38e3e2d -> 8b2a350e6
OODT-917 replace hashtables Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/8b2a350e Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/8b2a350e Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/8b2a350e Branch: refs/heads/master Commit: 8b2a350e687fbebbb1bde9416a7bf30aee00f5d3 Parents: af38e3e Author: Tom Barber <[email protected]> Authored: Tue Nov 3 16:14:09 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Tue Nov 3 16:14:09 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/oodt/xmlps/structs/CDEResult.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/8b2a350e/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java ---------------------------------------------------------------------- diff --git a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java index 6a725d6..1ed8732 100644 --- a/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java +++ b/xmlps/src/main/java/org/apache/oodt/xmlps/structs/CDEResult.java @@ -18,23 +18,26 @@ package org.apache.oodt.xmlps.structs; //OODT imports + import org.apache.oodt.xmlps.mapping.Mapping; import org.apache.oodt.xmlps.mapping.MappingField; import org.apache.oodt.xmlps.mapping.funcs.MappingFunc; import org.apache.oodt.xmlquery.QueryElement; import org.apache.oodt.xmlquery.Result; -//JDK imports import java.io.IOException; import java.io.InputStream; import java.sql.Connection; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.concurrent.ConcurrentHashMap; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; + +//JDK imports /** * A {@link Result} that wraps a {@link ResultSet} and returns rows as Strings, @@ -113,7 +116,7 @@ public class CDEResult extends Result { CDERow row = new CDERow(); ResultSetMetaData met = rs.getMetaData(); int count = met.getColumnCount(); - Map<String, CDEValue> dbValMap = new ConcurrentHashMap<String, CDEValue>(); + Map<String, CDEValue> dbValMap = new HashMap<String, CDEValue>(); Map<String, CDEValue> constValMap = cdeListToMap(this.constValues); List<CDEValue> orderedDbVals = new Vector<CDEValue>(); @@ -165,7 +168,7 @@ public class CDEResult extends Result { } private Map<String, CDEValue> cdeListToMap(List<CDEValue> vals){ - Map<String, CDEValue> map = new ConcurrentHashMap<String, CDEValue>(); + Map<String, CDEValue> map = new HashMap<String, CDEValue>(); if(vals != null){ for(CDEValue val: vals){ map.put(val.getCdeName(), val);
