mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.0 to HEAD
5523: Merged V1.4 to V2.0 5494: db.schema.update=false disables ALL metadata queries 5500: AR-1399 NTProtocolHander search handle leakage 5522: AR-1412 IndexRemoteTransactionTracker startup 5541: Merged V1.4 to V2.0 5525: Pass-through authentication and domain mapping Resolved minor conflict on AlfrescoAuthenticator.java 5526: Domain mapping support git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -3414,7 +3414,6 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
if (searchDone == true || ctx.hasMoreFiles() == false)
|
||||
{
|
||||
|
||||
// Debug
|
||||
|
||||
if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_SEARCH))
|
||||
@@ -3422,6 +3421,17 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Release the search context
|
||||
|
||||
vc.deallocateSearchSlot(searchId);
|
||||
}
|
||||
else if (( srchFlag & FindFirstNext.CloseSearch) != 0)
|
||||
{
|
||||
// Debug
|
||||
|
||||
if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_SEARCH))
|
||||
logger.debug("End start search [" + searchId + "] (Close)");
|
||||
|
||||
// Release the search context
|
||||
|
||||
vc.deallocateSearchSlot(searchId);
|
||||
}
|
||||
}
|
||||
@@ -3677,6 +3687,17 @@ public class NTProtocolHandler extends CoreProtocolHandler
|
||||
|
||||
// Release the search context
|
||||
|
||||
vc.deallocateSearchSlot(searchId);
|
||||
}
|
||||
else if (( srchFlag & FindFirstNext.CloseSearch) != 0)
|
||||
{
|
||||
// Debug
|
||||
|
||||
if (logger.isDebugEnabled() && m_sess.hasDebug(SMBSrvSession.DBG_SEARCH))
|
||||
logger.debug("End start search [" + searchId + "] (Close)");
|
||||
|
||||
// Release the search context
|
||||
|
||||
vc.deallocateSearchSlot(searchId);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user