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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
View File

@@ -24,10 +24,8 @@ import java.io.InputStream;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.email.server.EmailServiceImpl;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.encoding.ContentCharsetFinder;
@@ -275,8 +273,6 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
*/
protected NodeRef addContentNode(NodeService nodeService, NodeRef parent, String name, QName assocType, boolean overwrite)
{
NodeRef childNodeRef = null;
String workingName = encodeSubject(name);
// Need to work out a new safe name.
@@ -292,9 +288,9 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
{
QName safeQName = QName.createQNameWithValidLocalName(NamespaceService.CONTENT_MODEL_1_0_URI, workingName);
List<ChildAssociationRef> childNodeRefs = nodeService.getChildAssocs(parent, ContentModel.ASSOC_CONTAINS, safeQName);
if (childNodeRefs.size() > 0)
NodeRef childNodeRef = nodeService.getChildByName(parent, ContentModel.ASSOC_CONTAINS, workingName);
if (childNodeRef != null)
{
if(overwrite)
{
@@ -302,7 +298,6 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
{
logger.debug("overwriting existing node :" + workingName);
}
childNodeRef=childNodeRefs.get(0).getChildRef();
// Node already exists
// The node is present already. Make sure the name case is correct