Afternoon merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-17 22:42:03 +00:00
parent 8818e8daba
commit bfd0d2a337
17 changed files with 445 additions and 85 deletions

View File

@@ -159,11 +159,18 @@ public class FileImporterImpl implements FileImporter
final File file,
FileFilter filter,
boolean recurse,
String containerName) throws Exception
final String containerName) throws Exception
{
if (containerName != null)
{
NodeRef newContainer = createDirectory(container, containerName, containerName);
TransactionWork<NodeRef> createDirectoryWork = new TransactionWork<NodeRef>()
{
public NodeRef doWork() throws Exception
{
return createDirectory(container, containerName, containerName);
}
};
NodeRef newContainer = TransactionUtil.executeInUserTransaction(transactionService, createDirectoryWork);
return create(counter, newContainer, file, filter, recurse, null);
}