Author: mattmann
Date: Fri Dec 14 19:31:33 2012
New Revision: 1422057

URL: http://svn.apache.org/viewvc?rev=1422057&view=rev
Log:
- fix for OODT-543: Update ExpImpCatalog tool to allow core Metadata to pass 
through when Embedded Catalogs are used

Modified:
    oodt/trunk/CHANGES.txt
    
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java

Modified: oodt/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1422057&r1=1422056&r2=1422057&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Fri Dec 14 19:31:33 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
 Release 0.5
 --------------------------------------------
 
+* OODT-543 Update ExpImpCatalog tool to allow core Metadata to pass through 
+  when Embedded Catalogs are used (mattmann, cinquini)
+
 * OODT-542 Need to update logging.properties for all servers post CAS CLI
   (mattmann)
 

Modified: 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java?rev=1422057&r1=1422056&r2=1422057&view=diff
==============================================================================
--- 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
 (original)
+++ 
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/tools/ExpImpCatalog.java
 Fri Dec 14 19:31:33 2012
@@ -247,10 +247,13 @@ public class ExpImpCatalog {
                                         + "]: Met Extraction and "
                                         + "Reference Extraction successful: 
writing to dest file manager");
 
-                // remove the default CAS fields for metadata
-                met.removeMetadata("CAS.ProductId");
-                met.removeMetadata("CAS.ProductReceivedTime");
-                met.removeMetadata("CAS.ProductName");
+                // OODT-543
+                if(sourceClient != null){
+                  // remove the default CAS fields for metadata
+                  met.removeMetadata("CAS.ProductId");
+                  met.removeMetadata("CAS.ProductReceivedTime");
+                  met.removeMetadata("CAS.ProductName");
+                }
 
                 Product destProduct = new Product();
                 // copy through


Reply via email to