svn commit: r965239 - /incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java

[ke...@apache.org]

Author: kelly
Date: Sun Jul 18 14:41:49 2010
New Revision: 965239

URL: http://svn.apache.org/viewvc?rev=965239&view=rev
Log:
This needed some (perhaps older) API of class Metadata which wasn't available; re-code to read K,V pairs into a Properties then put each into a K,[V] of a Metadata.

Modified:
    incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java

Modified: incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java?rev=965239&r1=965238&r2=965239&view=diff
==============================================================================
--- incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java (original)
+++ incubator/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/structs/TaskJobInput.java Sun Jul 18 14:41:49 2010
@@ -19,11 +19,15 @@
 package org.apache.oodt.cas.workflow.structs;
 
 //JDK imports
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Properties;
 
+
 //OODT imports
 import org.apache.oodt.cas.metadata.Metadata;
 import org.apache.oodt.cas.resource.structs.JobInput;
@@ -158,15 +162,28 @@ public class TaskJobInput implements Job
       try {
         this.taskConfig.getProperties().load(
             new FileInputStream(new File(staticConfigFile)));
-      } catch (Exception ignore) {
+      } catch (RuntimeException ex) {
+        throw ex;
+      } catch (Exception ignore) {  
       }
     }
 
     if (dynMetadataFile != null) {
+      InputStream in = null;
       try {
-        this.dynMetadata = new Metadata(new FileInputStream(new File(
-            dynMetadataFile)));
+        this.dynMetadata = new Metadata();
+        Properties fileProps = new Properties();
+        in = new BufferedInputStream(new FileInputStream(new File(dynMetadataFile)));
+        fileProps.load(in);
+        for (String key: fileProps.stringPropertyNames())
+          this.dynMetadata.addMetadata(key, fileProps.getProperty(key));
+      } catch (RuntimeException ex) {
+        throw ex;
       } catch (Exception ignore) {
+      } finally {
+        if (in != null) try {
+          in.close();
+        } catch (IOException ignore) {}
       }
     }