inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6338: Some WCM-435.
   6344: Fix for AWC-1452 (dialog close navigation issue)
   6345: Fix for AR-1611 and other related CIFS and NFS fixes
   6346: Minor javadoc fix for ReplicatingContentStore
   6347: Handle exceptions arising from UserTransaction.begin().
   6348: Many WCM fixes in one
            Conflicts resolved on faces-config-beans.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 13:21:08 +00:00
parent e3e2711e29
commit cd78bd51ba
7 changed files with 146 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/filesys/smb/server/repo/ContentDiskDriver.java
View File

@@ -567,6 +567,10 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
*/
public FileInfo getFileInformation(SrvSession session, TreeConnection tree, String path) throws IOException
{
// Start a transaction
session.beginReadTransaction(transactionService);
// Get the device root
ContentContext ctx = (ContentContext) tree.getContext();
@@ -598,7 +602,6 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
{
// Get the file information for the node
session.beginReadTransaction(transactionService);
finfo = cifsHelper.getFileInformation(nodeRef);
}
@@ -624,10 +627,6 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
if ( fstate.hasNodeRef() == false)
{
// Create the transaction
session.beginReadTransaction(transactionService);
// Get the node for the folder path
fstate.setNodeRef( getNodeForPath( tree, paths[0]));
@@ -674,7 +673,6 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
{
// Get the file information for the node
session.beginReadTransaction(transactionService);
finfo = cifsHelper.getFileInformation(nodeRef);
// DEBUG
@@ -688,10 +686,6 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
if ( finfo == null)
{
// Start a transaction
session.beginReadTransaction(transactionService);
String[] paths = FileName.splitPath( path);
if ( paths[0] != null && paths[0].length() > 1)
@@ -737,6 +731,13 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
}
catch (FileNotFoundException e)
{
// Check if there is a transaction active
if ( session.hasUserTransaction() == false) {
System.out.println("***** getFileInformation() - no transaction active");
e.printStackTrace();
}
// a valid use case
if (logger.isDebugEnabled())
logger.debug("Getting file information - File not found: \n" +
@@ -1458,7 +1459,7 @@ public class ContentDiskDriver extends AlfrescoDiskDriver implements DiskInterfa
// DEBUG
if ( logger.isDebugEnabled())
logger.debug("Creaste file, state=" + fstate);
logger.debug("Create file, state=" + fstate);
}
}