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

16
source/java/org/alfresco/filesys/server/oncrpc/nfs/NFSServer.java
View File

@@ -1666,8 +1666,7 @@ public class NFSServer extends RpcNetworkServer implements RpcProcessor {
// Write to the network file
disk.writeFile(sess, conn, netFile, rpc.getBuffer(), rpc
.getPosition(), count, offset);
disk.writeFile(sess, conn, netFile, rpc.getBuffer(), rpc.getPosition(), count, offset);
}
// Get file information for the path and pack the response
@@ -1707,8 +1706,7 @@ public class NFSServer extends RpcNetworkServer implements RpcProcessor {
// DEBUG
if (logger.isDebugEnabled() && hasDebugFlag(DBG_ERROR)) {
logger.debug("Write Exception: netFile=" + netFile + ", cache=" + sess.getFileCache().numberOfEntries());
logger.debug(ex);
logger.debug("Write Exception: netFile=" + netFile + ", cache=" + sess.getFileCache().numberOfEntries(), ex);
}
}
@@ -1902,6 +1900,9 @@ public class NFSServer extends RpcNetworkServer implements RpcProcessor {
}
catch (AccessDeniedException ex) {
errorSts = NFS.StsAccess;
if ( logger.isDebugEnabled())
logger.debug("Create error:", ex);
}
catch (Exception ex) {
errorSts = NFS.StsServerFault;
@@ -1909,7 +1910,7 @@ public class NFSServer extends RpcNetworkServer implements RpcProcessor {
// DEBUG
if (logger.isDebugEnabled() && hasDebugFlag(DBG_ERROR))
logger.debug("Create Exception: " + ex.toString());
logger.debug("Create Exception: " + ex.toString(), ex);
}
// Check for a failure status
@@ -3241,8 +3242,7 @@ public class NFSServer extends RpcNetworkServer implements RpcProcessor {
// DEBUG
if (logger.isDebugEnabled() && hasDebugFlag(DBG_SEARCH))
logger.debug("ReadDir return entries=" + entCnt + ", eof="
+ search.hasMoreFiles());
logger.debug("ReadDir return entries=" + (entCnt - 1) + ", eof=" + search.hasMoreFiles());
}
catch (BadHandleException ex) {
errorSts = NFS.StsBadHandle;
@@ -3612,7 +3612,7 @@ public class NFSServer extends RpcNetworkServer implements RpcProcessor {
// DEBUG
if (logger.isDebugEnabled() && hasDebugFlag(DBG_SEARCH))
logger.debug("ReadDirPlus return entries=" + entCnt + ", eof=" + (search.hasMoreFiles() ? false : true));
logger.debug("ReadDirPlus return entries=" + (entCnt - 1) + ", eof=" + (search.hasMoreFiles() ? false : true));
}
catch (BadHandleException ex) {
errorSts = NFS.StsBadHandle;

6
source/java/org/alfresco/filesys/server/oncrpc/nfs/NetworkFileCache.java
View File

@@ -277,6 +277,12 @@ public class NetworkFileCache {
// Close the file via the disk interface
try {
// DEBUG
if ( logger.isDebugEnabled())
logger.debug( "NFSFileExpiry: Closing file " + fentry.getFile().getFullName());
// Set the current user using the session that last accessed the file