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

MERGE V3.3 BUG-FIX to HEAD

Browse Source 
Merge V3.3-BUG-FIX-2010_08_11 to V3.3-BUG-FIX
      22181 : ALF-4358: IMAP lsub or list from a subdirectory returns no result

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-09-02 16:29:48 +00:00
parent f41285ba21
commit 24ff9c9195
6 changed files with 392 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
View File

@@ -52,7 +52,6 @@ import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.util.GUID;
import org.alfresco.util.Utf7;
import org.apache.commons.logging.Log;
@@ -395,7 +394,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
if (logger.isDebugEnabled())
{
logger.debug("getFullNameInternal entry");
logger.debug("[getFullNameInternal] entry");
}
StringBuilder fullName = new StringBuilder();
@@ -458,13 +457,13 @@ public class AlfrescoImapFolder extends AbstractImapFolder
{
if (logger.isDebugEnabled())
{
logger.debug("getMessageCountInternal entry");
logger.debug("[getMessageCountInternal] entry");
}
if (messages.size() == 0 && folderInfo != null)
{
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
convertToMessages(fileInfos);
}
if (logger.isDebugEnabled() && folderInfo != null)
{
@@ -481,10 +480,14 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected long[] getMessageUidsInternal()
{
if (logger.isDebugEnabled())
{
logger.debug("[getMessageUidsInternal] entry");
}
if (messages == null || messages.size() == 0 && folderInfo != null)
{
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
convertToMessages(fileInfos);
}
int len = messages.size();
long[] uids = new long[len];
@@ -505,15 +508,23 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected List<SimpleStoredMessage> getMessagesInternal()
{
if (logger.isDebugEnabled())
{
logger.debug("[getMessagesInternal] entry");
}
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
return getMessages(fileInfos);
return convertToMessages(fileInfos);
}
private List<SimpleStoredMessage> getMessages(List<FileInfo> fileInfos)
private List<SimpleStoredMessage> convertToMessages(List<FileInfo> fileInfos)
{
if (logger.isDebugEnabled())
{
logger.debug("[convertToMessages] entry");
}
if (fileInfos == null || fileInfos.size() == 0)
{
logger.debug("getMessages - fileInfos is empty or null");
logger.debug("[convertToMessages] - fileInfos is empty or null");
return Collections.emptyList();
}
if (fileInfos.size() != messages.size())
@@ -531,12 +542,12 @@ public class AlfrescoImapFolder extends AbstractImapFolder
if (logger.isDebugEnabled())
{
logger.debug("Message added: " + fileInfo.getName());
logger.debug("[convertToMessages] Message added: " + fileInfo.getName());
}
}
catch (MessagingException e)
{
logger.warn("Invalid message! File name:" + fileInfo.getName(), e);
logger.warn("[convertToMessages] Invalid message! File name:" + fileInfo.getName(), e);
}
}
}
@@ -566,12 +577,12 @@ public class AlfrescoImapFolder extends AbstractImapFolder
{
if (logger.isDebugEnabled())
{
logger.debug("getMessagesInternal entry");
logger.debug("[getMessagesInternal] entry");
}
if (messages == null || messages.size() == 0)
{
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
convertToMessages(fileInfos);
}
List<SimpleStoredMessage> ret = new ArrayList<SimpleStoredMessage>();
for (int i = 0; i < messages.size(); i++)
@@ -584,7 +595,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
if (logger.isDebugEnabled())
{
logger.debug("getMessagesInternal exit");
logger.debug("[getMessagesInternal] exit");
}
return ret;
@@ -627,12 +638,16 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected List<SimpleStoredMessage> getNonDeletedMessagesInternal()
{
if (logger.isDebugEnabled())
{
logger.debug("[getNonDeletedMessagesInternal] entry");
}
List<SimpleStoredMessage> result = new ArrayList<SimpleStoredMessage>();
if (messages.size() == 0 && folderInfo != null)
{
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
convertToMessages(fileInfos);
}
Collection<SimpleStoredMessage> values = messages.values();
@@ -673,10 +688,14 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected int getRecentCountInternal(boolean reset)
{
if (logger.isDebugEnabled())
{
logger.debug("[getRecentCountInternal] entry");
}
if (messages.size() == 0 && folderInfo != null)
{
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
convertToMessages(fileInfos);
}
int count = 0;
@@ -732,10 +751,14 @@ public class AlfrescoImapFolder extends AbstractImapFolder
@Override
protected int getUnseenCountInternal()
{
if (logger.isDebugEnabled())
{
logger.debug("[getUnseenCountInternal] entry");
}
if (messages.size() == 0 && folderInfo != null)
{
List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
getMessages(fileInfos);
convertToMessages(fileInfos);
}
int count = 0;