Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4313 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4314 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4317 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4318 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-19 14:28:55 +00:00
parent cfb373ae36
commit 488450a988
17 changed files with 1807 additions and 877 deletions

View File

@@ -60,8 +60,7 @@ public class DCERPCHandler
// Get the tree id from the received packet and validate that it is a valid
// connection id.
int treeId = srvTrans.getTreeId();
TreeConnection conn = sess.findConnection(treeId);
TreeConnection conn = sess.findTreeConnection( srvTrans);
if (conn == null)
{
@@ -187,12 +186,13 @@ public class DCERPCHandler
* Process a DCE/RPC request
*
* @param sess SMBSrvSession
* @param vc VirtualCircuit
* @param tbuf TransactBuffer
* @param outPkt SMBSrvPacket
* @exception IOException
* @exception SMBSrvException
*/
public static final void processDCERPCRequest(SMBSrvSession sess, TransactBuffer tbuf, SMBSrvPacket outPkt)
public static final void processDCERPCRequest(SMBSrvSession sess, VirtualCircuit vc, TransactBuffer tbuf, SMBSrvPacket outPkt)
throws IOException, SMBSrvException
{
@@ -207,8 +207,7 @@ public class DCERPCHandler
// Get the tree id from the received packet and validate that it is a valid
// connection id.
int treeId = tbuf.getTreeId();
TreeConnection conn = sess.findConnection(treeId);
TreeConnection conn = vc.findConnection( tbuf.getTreeId());
if (conn == null)
{
@@ -348,8 +347,7 @@ public class DCERPCHandler
// Get the tree id from the received packet and validate that it is a valid
// connection id.
int treeId = inPkt.getTreeId();
TreeConnection conn = sess.findConnection(treeId);
TreeConnection conn = sess.findTreeConnection( inPkt);
if (conn == null)
{
@@ -482,8 +480,7 @@ public class DCERPCHandler
// Get the tree id from the received packet and validate that it is a valid
// connection id.
int treeId = inPkt.getTreeId();
TreeConnection conn = sess.findConnection(treeId);
TreeConnection conn = sess.findTreeConnection( inPkt);
if (conn == null)
{