Changeset 3729

Timestamp:

Sep 13, 2007, 4:08:24 PM (15 years ago)

Author:

Johan Enell

Message:

Fixes #739

Removes AnyToAny?

File:

• branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (3 diffs)

branches/2.4-stable/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -607 +607 @@
       File stdin = null;
       File stdout = null;
+      Transformation trans = null;
       try
       {
@@ -613 +614 @@
         getConfigureJobParameters();
   
-        Transformation trans = null;
         
         //Export
@@ -704 +704 @@
           return;
         }
-        
-        //Clean up
+      }
+      finally
+      {
+        if (dc != null)
+        {
+          dc.commit();
+          dc.close();
+        }
+      }
+      
+      //Clean up
+      try
+      {
+        dc = sc.newDbControl();
         if (!Values.getBoolean(String.valueOf(configuration.getValue(leaveStdinParameter.getName()))))
         {
-          dc.deleteItem(stdin);
+          if (stdin != null)
+          {
+            stdin = File.getById(dc, stdin.getId());
+            if (trans != null)
+            {
+              trans = Transformation.getById(dc, trans.getId());
+              AnyToAny ata = AnyToAny.getByName(dc, trans, stdin.getPath().toString());
+              dc.deleteItem(ata);
+            }
+            dc.deleteItem(stdin);
+          }
         }
         if (!Values.getBoolean(String.valueOf(configuration.getValue(leaveStdoutParameter.getName()))))
         {
-          dc.deleteItem(stdout);
+          if (stdout != null)
+          {
+            stdout = File.getById(dc, stdout.getId());
+            if (trans != null)
+            {
+              trans = Transformation.getById(dc, trans.getId());
+              AnyToAny ata = AnyToAny.getByName(dc, trans, stdout.getPath().toString());
+              dc.deleteItem(ata);
+            }
+            dc.deleteItem(stdout);
+          }
         }
       }