Author: bfoster
Date: Sun Apr 3 20:11:51 2011
New Revision: 1088405
URL: http://svn.apache.org/viewvc?rev=1088405&view=rev
Log:
changed HashMap to LinkedHashMap to maintain query result order
-----------------------
OODT-170
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1088405&r1=1088404&r2=1088405&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sun Apr 3 20:11:51 2011
@@ -4,6 +4,8 @@ Apache OODT Change Log
Release 0.3-SNAPSHOT (in progress)
--------------------------------------------
+* OODT-170 cas-catalog shuffles query results . . . order is lost (bfoster)
+
* OODT-169 Pushpull dirstruct xml files fail to replace global
variables in name attribute for dir and file elements (bfoster)
Modified:
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java?rev=1088405&r1=1088404&r2=1088405&view=diff
==============================================================================
---
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
(original)
+++
oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/system/impl/CatalogServiceLocal.java
Sun Apr 3 20:11:51 2011
@@ -807,7 +807,7 @@ public class CatalogServiceLocal impleme
protected List<TransactionReceipt>
getPossiblyUnindexedTransactionReceipts(List<CatalogReceipt> catalogReceipts)
throws CatalogServiceException {
try {
List<TransactionReceipt> returnList = new
Vector<TransactionReceipt>();
- HashMap<TransactionId<?>, List<CatalogReceipt>>
existing = new HashMap<TransactionId<?>, List<CatalogReceipt>>();
+ LinkedHashMap<TransactionId<?>, List<CatalogReceipt>>
existing = new LinkedHashMap<TransactionId<?>, List<CatalogReceipt>>();
for (CatalogReceipt catalogReceipt : catalogReceipts) {
TransactionId<?> catalogServiceTransactionId =
this.getCatalogServiceTransactionId(catalogReceipt.getTransactionId(),
catalogReceipt.getCatalogId());
if (catalogServiceTransactionId != null) {
