Merge DEV to HEAD

ContentDiskDriver rework.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-07-29 09:08:54 +00:00
parent 65cb62ceb8
commit b4bd3a21c2
83 changed files with 11518 additions and 1101 deletions

View File

@@ -569,7 +569,7 @@ public class ContentIOControlHandler implements IOControlHandler
// Get the list of targets for the action
int targetCnt = reqBuf.getInt();
DesktopParams deskParams = new DesktopParams(sess, contentDriver, folderNode, netFile);
DesktopParams deskParams = new DesktopParams(sess, folderNode, netFile);
while ( reqBuf.getAvailableLength() > 4 && targetCnt > 0)
{