Changeset 3264 for trunk/src/plugins

Timestamp:

Apr 23, 2007, 4:48:43 PM (15 years ago)

Author:

Johan Enell

Message:

Merged log:branches/2.2.3#3188:3260 to trunk.

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java (modified) (2 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

@@ -58 +58 @@
 import net.sf.basedb.core.Transformation;
 import net.sf.basedb.core.Type;
+import net.sf.basedb.core.User;
 import net.sf.basedb.core.plugin.About;
 import net.sf.basedb.core.plugin.AboutImpl;
@@ -1012 +1013 @@
         }
       }
-      String homeDirectoryPath = "";
+      String homeDirectoryPath = "/" + PluginConfiguration.getById(dc, configuration.getId()).getName();
       Directory homeDirectory = experiment.getDirectory();
-      if (homeDirectory == null)
-      {
-        homeDirectoryPath = homeDirectory.getPath() + "/" + PluginConfiguration.getById(dc, configuration.getId()).getName();
+      if (homeDirectory != null)
+      {
+        homeDirectoryPath = homeDirectory.getPath() + homeDirectoryPath;
+      }
+      else
+      {
+        homeDirectory = User.getById(dc, sc.getLoggedInUserId()).getHomeDirectory();
+        if (homeDirectory != null)
+        {
+          homeDirectoryPath = homeDirectory.getPath() + homeDirectoryPath;
+        }
       }
       pluginDirectoryParameter = new PluginParameter<String>(