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

ALF-11957: Fixed merge issues

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-12-09 13:25:02 +00:00
parent 658e968320
commit bcafdc48ad
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
View File

@@ -222,7 +222,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
} }
IdsEntity idsEntity = new IdsEntity(); IdsEntity idsEntity = new IdsEntity();
idsEntity.setIds(new ArrayList<Long>(nodeIds)); idsEntity.setIds(new ArrayList<Long>(nodeIds));
return template.queryForList(SELECT_CONTENT_DATA_BY_NODE_IDS, idsEntity); return (List<ContentDataEntity>)template.selectList(SELECT_CONTENT_DATA_BY_NODE_IDS, idsEntity);
} }
@Override @Override

12
source/java/org/alfresco/repo/imap/ImapServiceImpl.java
View File

@@ -20,8 +20,6 @@ package org.alfresco.repo.imap;
import static org.alfresco.repo.imap.AlfrescoImapConst.DICTIONARY_TEMPLATE_PREFIX; import static org.alfresco.repo.imap.AlfrescoImapConst.DICTIONARY_TEMPLATE_PREFIX;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
@@ -45,10 +43,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.mail.Flags; import javax.mail.Flags;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import javax.mail.Flags.Flag;
import javax.mail.Multipart; import javax.mail.Multipart;
import javax.mail.Part; import javax.mail.Part;
import javax.mail.Flags.Flag;
import javax.mail.internet.AddressException;
import javax.mail.internet.ContentType; import javax.mail.internet.ContentType;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeUtility; import javax.mail.internet.MimeUtility;
@@ -1650,11 +1650,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
{ {
policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE); policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE); policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
} }
return null;
}
}, AuthenticationUtil.getSystemUserName());
} }
private class UidValidityTransactionListener extends TransactionListenerAdapter private class UidValidityTransactionListener extends TransactionListenerAdapter