svn commit: r1089645 - /oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/catalogservice/FilemgrCatalogIndex.java

[bfoster]

Author: bfoster
Date: Wed Apr  6 21:58:47 2011
New Revision: 1089645

URL: http://svn.apache.org/viewvc?rev=1089645&view=rev
Log:

- updates to TemporalProduct usage

---------------

Modified:
    
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/catalogservice/FilemgrCatalogIndex.java

Modified: 
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/catalogservice/FilemgrCatalogIndex.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/catalogservice/FilemgrCatalogIndex.java?rev=1089645&r1=1089644&r2=1089645&view=diff
==============================================================================
--- 
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/catalogservice/FilemgrCatalogIndex.java
 (original)
+++ 
oodt/branches/wengine-branch/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/catalogservice/FilemgrCatalogIndex.java
 Wed Apr  6 21:58:47 2011
@@ -301,7 +301,7 @@ public class FilemgrCatalogIndex impleme
 //                     if (productReceivedTime == null)
 //                             
metadata.replaceMetadata(CoreMetKeys.PRODUCT_RECEVIED_TIME, 
DateConvert.isoFormat(new Date()));
 //                     metadata.replaceMetadata(CoreMetKeys.PRODUCT_ID, 
product.getProductId());
-                       return new 
IngestReceipt(this.generateTransactionId(product.getProductId()), (product 
instanceof TemporalProduct ? ((TemporalProduct) 
product).getProductReceivedTime() : new Date()));
+                       return new 
IngestReceipt(this.generateTransactionId(product.getProductId()), (product 
instanceof TemporalProduct && ((TemporalProduct) 
product).getProductReceivedTime() != null ? ((TemporalProduct) 
product).getProductReceivedTime() : new Date()));
                }catch (Exception e) {
                        throw new IngestServiceException("Failed to Ingest 
Product for TransactionId: " + transactionId, e);
                }
@@ -447,7 +447,7 @@ public class FilemgrCatalogIndex impleme
 //                     for (Metadata metadata : metadatas) 
 //                             ingestReceipts.add(generateReceipt(metadata));
                        for (Product product : products)
-                               ingestReceipts.add(new 
IngestReceipt(this.generateTransactionId(product.getProductId()), (product 
instanceof TemporalProduct ? ((TemporalProduct) 
product).getProductReceivedTime() : new Date())));
+                               ingestReceipts.add(new 
IngestReceipt(this.generateTransactionId(product.getProductId()), (product 
instanceof TemporalProduct && ((TemporalProduct) 
product).getProductReceivedTime() != null ? ((TemporalProduct) 
product).getProductReceivedTime() : new Date())));
                        return ingestReceipts;
                }catch (Exception e) {
                        throw new QueryServiceException("Failed to perform 
CatalogQuery '" + queryExpression + "' : " + e.getMessage(), e);
@@ -524,7 +524,7 @@ public class FilemgrCatalogIndex impleme
 
                        List<IngestReceipt> ingestReceipts = new 
Vector<IngestReceipt>();
                        for (Product product : products)
-                               ingestReceipts.add(new 
IngestReceipt(this.generateTransactionId(product.getProductId()), (product 
instanceof TemporalProduct ? ((TemporalProduct) 
product).getProductReceivedTime() : new Date())));
+                               ingestReceipts.add(new 
IngestReceipt(this.generateTransactionId(product.getProductId()), (product 
instanceof TemporalProduct && ((TemporalProduct) 
product).getProductReceivedTime() != null ? ((TemporalProduct) 
product).getProductReceivedTime() : new Date())));
                        return ingestReceipts;
                }catch (Exception e) {
                        throw new QueryServiceException("Failed to perform 
CatalogQuery '" + queryExpression + "' : " + e.getMessage(), e);