From bcafdc48ad8dbb154fa794c9dbd33f31cc208133 Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Fri, 9 Dec 2011 13:25:02 +0000
Subject: [PATCH] ALF-11957: Fixed merge issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../contentdata/ibatis/ContentDataDAOImpl.java       |  2 +-
 .../java/org/alfresco/repo/imap/ImapServiceImpl.java | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
index 43843324a2..ce3b8b22c3 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
@@ -222,7 +222,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
         }
         IdsEntity idsEntity = new IdsEntity();
         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
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
index d5fce956b4..04418d4ecd 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
@@ -20,8 +20,6 @@ package org.alfresco.repo.imap;
 
 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.IOException;
 import java.io.OutputStream;
@@ -45,10 +43,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.mail.Flags;
 import javax.mail.MessagingException;
-import javax.mail.Flags.Flag;
 import javax.mail.Multipart;
 import javax.mail.Part;
+import javax.mail.Flags.Flag;
+import javax.mail.internet.AddressException;
 import javax.mail.internet.ContentType;
+import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeUtility;
 
@@ -1650,11 +1650,7 @@ public class ImapServiceImpl implements ImapService, OnCreateChildAssociationPol
         {
             policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
             policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
-                }
-        
-                return null;
-            }
-        }, AuthenticationUtil.getSystemUserName());
+        }
     }
 
     private class UidValidityTransactionListener extends TransactionListenerAdapter