Repository: oodt Updated Branches: refs/heads/master 8b2a350e6 -> d86502c59
OODT-917 revert xmlrpc hashmap to hashtable for legacy support Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d86502c5 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d86502c5 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d86502c5 Branch: refs/heads/master Commit: d86502c5985f262c098db6a8938c33611652d78e Parents: 8b2a350 Author: Tom Barber <[email protected]> Authored: Tue Nov 3 17:08:13 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Tue Nov 3 17:08:13 2015 +0000 ---------------------------------------------------------------------- .../cas/catalog/system/impl/CatalogServiceLocal.java | 4 ++-- .../oodt/commons/util/EnterpriseEntityResolver.java | 4 ++-- .../oodt/cas/resource/mux/StandardBackendManager.java | 12 ++++++------ .../oodt/cas/resource/util/XmlRpcStructFactory.java | 9 +++++---- 4 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/d86502c5/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java ---------------------------------------------------------------------- diff --git a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java index fdc4962..0e18335 100644 --- a/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java +++ b/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java @@ -845,8 +845,8 @@ public class CatalogServiceLocal implements CatalogService { returnList.add(new TransactionReceipt(null, Collections.singletonList(catalogReceipt))); } } - for (Entry<TransactionId<?>, List<CatalogReceipt>> transactionId : existing.entrySet()) { - returnList.add(new TransactionReceipt(transactionId.getKey(), existing.get(transactionId.getValue()))); + for (Map.Entry<TransactionId<?>, List<CatalogReceipt>> transactionId : existing.entrySet()) { + returnList.add(new TransactionReceipt(transactionId.getKey(), existing.get(transactionId.getKey()))); } return returnList; }catch (Exception e) { http://git-wip-us.apache.org/repos/asf/oodt/blob/d86502c5/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java index 547a011..dc49b9b 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/EnterpriseEntityResolver.java @@ -30,10 +30,10 @@ import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import java.util.concurrent.ConcurrentHashMap; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; @@ -51,7 +51,7 @@ public class EnterpriseEntityResolver implements EntityResolver { /** Initialize the class by reading the entites.xml file. */ static { - entities = new ConcurrentHashMap(); + entities = new HashMap(); try { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setNamespaceAware(false); http://git-wip-us.apache.org/repos/asf/oodt/blob/d86502c5/resource/src/main/java/org/apache/oodt/cas/resource/mux/StandardBackendManager.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/mux/StandardBackendManager.java b/resource/src/main/java/org/apache/oodt/cas/resource/mux/StandardBackendManager.java index ff36ea6..5aa8127 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/mux/StandardBackendManager.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/mux/StandardBackendManager.java @@ -16,16 +16,16 @@ */ package org.apache.oodt.cas.resource.mux; -import java.util.concurrent.ConcurrentHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import org.apache.oodt.cas.resource.batchmgr.Batchmgr; import org.apache.oodt.cas.resource.monitor.Monitor; import org.apache.oodt.cas.resource.scheduler.Scheduler; import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + /** * This manager keeps track of the mux-able backends for the resource manager. * It effectively maps a queue to the backend that this queue feeds. @@ -40,7 +40,7 @@ import org.apache.oodt.cas.resource.structs.exceptions.QueueManagerException; * @author starchmd */ public class StandardBackendManager implements BackendManager { - Map<String,BackendSet> queueToBackend = new ConcurrentHashMap<String,BackendSet>(); + Map<String,BackendSet> queueToBackend = new HashMap<String,BackendSet>(); /** * Add in a backend set to this manager. http://git-wip-us.apache.org/repos/asf/oodt/blob/d86502c5/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java ---------------------------------------------------------------------- diff --git a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java index 9487661..3e354a5 100644 --- a/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java +++ b/resource/src/main/java/org/apache/oodt/cas/resource/util/XmlRpcStructFactory.java @@ -25,6 +25,7 @@ import org.apache.oodt.cas.resource.structs.ResourceNode; import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; +import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Vector; @@ -46,8 +47,8 @@ public final class XmlRpcStructFactory { throw new InstantiationException("Don't construct factory classes!"); } - public static HashMap<String, Object> getXmlRpcJob(Job job) { - HashMap<String, Object> jobHash = new HashMap<String, Object>(); + public static Hashtable<String, Object> getXmlRpcJob(Job job) { + Hashtable<String, Object> jobHash = new Hashtable<String, Object>(); jobHash.put("job.id", job.getId() != null ? job.getId():""); jobHash.put("job.name", job.getName()); jobHash.put("job.instanceClassName", job.getJobInstanceClassName()); @@ -120,8 +121,8 @@ public final class XmlRpcStructFactory { return resNodes; } - public static HashMap<String,String> getXmlRpcResourceNode(ResourceNode node) { - HashMap<String, String> resNodeHash = new HashMap<String, String>(); + public static Hashtable<String,String> getXmlRpcResourceNode(ResourceNode node) { + Hashtable<String, String> resNodeHash = new Hashtable<String, String>(); resNodeHash.put("node.id", node.getNodeId()); resNodeHash.put("node.capacity", String.valueOf(node.getCapacity())); resNodeHash.put("node.url", node.getIpAddr().toExternalForm());
