Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/plugins/core/net/sf/basedb/plugins/Base1PluginExecuter.java

    r3128 r3264  
    5858import net.sf.basedb.core.Transformation;
    5959import net.sf.basedb.core.Type;
     60import net.sf.basedb.core.User;
    6061import net.sf.basedb.core.plugin.About;
    6162import net.sf.basedb.core.plugin.AboutImpl;
     
    10121013        }
    10131014      }
    1014       String homeDirectoryPath = "";
     1015      String homeDirectoryPath = "/" + PluginConfiguration.getById(dc, configuration.getId()).getName();
    10151016      Directory homeDirectory = experiment.getDirectory();
    1016       if (homeDirectory == null)
    1017       {
    1018         homeDirectoryPath = homeDirectory.getPath() + "/" + PluginConfiguration.getById(dc, configuration.getId()).getName();
     1017      if (homeDirectory != null)
     1018      {
     1019        homeDirectoryPath = homeDirectory.getPath() + homeDirectoryPath;
     1020      }
     1021      else
     1022      {
     1023        homeDirectory = User.getById(dc, sc.getLoggedInUserId()).getHomeDirectory();
     1024        if (homeDirectory != null)
     1025        {
     1026          homeDirectoryPath = homeDirectory.getPath() + homeDirectoryPath;
     1027        }
    10191028      }
    10201029      pluginDirectoryParameter = new PluginParameter<String>(
Note: See TracChangeset for help on using the changeset viewer.